Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics

diff --cc start.php
index 51cf7fa60c62207369513e3fff7785eb72471423,17ce067d71def86402f57f9354e7e48c752127cd..0b9d709f3bd3a4bc440ee85ec3316bf2edddfac0
--- 1/start.php
--- 2/start.php
+++ b/start.php
@@@ -38,19 -38,23 +38,15 @@@ function tidypics_init() 
        $js = elgg_get_simplecache_url('js', 'photos/tidypics');
        elgg_register_simplecache_view('js/photos/tidypics');
        elgg_register_js('tidypics', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/upload');
 -      elgg_register_simplecache_view('js/photos/upload');
 -      elgg_register_js('tidypics:upload', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/tagging');
 -      elgg_register_simplecache_view('js/photos/tagging');
 -      elgg_register_js('tidypics:tagging', $js, 'footer');
 -
 -      elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer');
 -      
 -      $js_base = 'mod/tidypics/vendors/jquery-file-upload/js';
 +
 +      $js_base = 'mod/lightpics/vendors/jquery-file-upload/js';
        
-       elgg_register_js('jquery-tmpl', "http://blueimp.github.com/JavaScript-Templates/tmpl.js", 'footer');
+       elgg_register_js('jquery-tmpl', "$js_base/vendor/tmpl.min.js", 'footer');
        elgg_register_js('jquery-load-image', "$js_base/vendor/load-image.min.js", 'footer');
        elgg_register_js('jquery-canvas-to-blob', "$js_base/vendor/canvas-to-blob.min.js", 'footer');
-       elgg_register_js('jquery-image-gallery', "$js_base/vendor/jquery.image-gallery.min.js", 'footer');
-       elgg_register_js('jquery-iframe-transport', "$js_base/jquery.iframe-transport.js", 'footer');
        
        elgg_register_js('jquery-fileupload', "$js_base/jquery.fileupload.js", 'footer');
-       elgg_register_js('jquery-fileupload-fp', "$js_base/jquery.fileupload-fp.js", 'footer');
        elgg_register_js('jquery-fileupload-ui', "$js_base/jquery.fileupload-ui.js", 'footer');
-       elgg_register_js('jquery-fileupload-jui', "$js_base/jquery.fileupload-jui.js", 'footer');
        
        // Add photos link to owner block/hover menus
        elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');