Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 10 insertions, 10 deletions

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index b3580b81f..8168eb2c0 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -8,12 +8,12 @@ head_add_css('library/jRange/jquery.range.css');
 
 head_add_css('view/css/conversation.css');
 head_add_css('view/css/widgets.css');
-head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css');
-head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
+head_add_css('view/css/colorbox.css');
+head_add_css('library/justifiedGallery/justifiedGallery.css');
 
 head_add_js('jquery.js');
-head_add_js('jquery-migrate-1.1.1.js');
-head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js');
+//head_add_js('jquery-migrate-1.1.1.js');
+head_add_js('library/justifiedGallery/jquery.justifiedGallery.js');
 
 //head_add_js('jquery-compat.js');
 head_add_js('spin.js');
@@ -21,13 +21,13 @@ head_add_js('jquery.spin.js');
 head_add_js('jquery.textinputs.js');
 head_add_js('autocomplete.js');
 head_add_js('library/jquery-textcomplete/jquery.textcomplete.js');
-head_add_js('library/colorbox/jquery.colorbox.js');
+//head_add_js('library/colorbox/jquery.colorbox.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/readmore.js/readmore.js');
-head_add_js('library/jquery_ac/friendica.complete.js');
-head_add_js('library/tiptip/jquery.tipTip.minified.js');
+//head_add_js('library/jquery_ac/friendica.complete.js');
+//head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
-head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
+//head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
 head_add_js('library/cryptojs/components/core-min.js');
 head_add_js('library/cryptojs/rollups/aes.js');
 head_add_js('library/cryptojs/rollups/rabbit.js');
@@ -38,9 +38,9 @@ head_add_js('webtoolkit.base64.js');
 head_add_js('main.js');
 head_add_js('crypto.js');
 head_add_js('library/jRange/jquery.range.js');
-head_add_js('docready.js');
+//head_add_js('docready.js');
 head_add_js('library/colorbox/jquery.colorbox-min.js');
-head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js');
+
 
 head_add_js('library/jquery.AreYouSure/jquery.are-you-sure.js');
 head_add_js('library/tableofcontents/jquery.toc.js');