Merge pull request #6393 from pravi/patch-2

switch back to jquery-colorbox

app/assets/javascripts/jsxc.js

@@ -1,5 +1,5 @@
 //= require jquery.slimscroll
-//= require colorbox
+//= require jquery-colorbox
 //= require favico.js
 //= require jquery-fullscreen-plugin
 //= require diaspora_jsxc

app/assets/stylesheets/_application.scss

@@ -78,7 +78,6 @@
 @import 'stream';
 @import 'stream_element';
 @import 'comments';
-@import 'colorbox';
 @import 'diaspora_jsxc';
 @import 'chat';
 @import 'markdown-content';