filemanger authentication changes and also announcement preview fixed and also text search for files

Conflicts:
	app/views/admin/assets/index.html.erb

app/assets/javascripts/admin/filemanager.js

@@ -108,8 +108,10 @@ $(document).ready(function(){
 	})
 	var currentEdit = null;
 	$(document).on("ajax:success","form[data-remote=true]",function(evt, data, xhr){
-		currentEdit.replaceWith($(data));
-		$("#editform").modal("hide");
+		if(currentEdit){
+			currentEdit.replaceWith($(data));
+			$("#editform").modal("hide");
+		}
 	})
 
 	$("#asset_sort_list").on(clickEvent,".editform",function(){
@@ -120,6 +122,10 @@ $(document).ready(function(){
 		return false;
 	})
 
+	$("#editform").on("hidden",function(){
+		currentEdit = null;
+	})
+
 	function getUrlParam( paramName ) {
 	    var reParam = new RegExp( '(?:[\?&]|&)' + paramName + '=([^&]+)', 'i' ) ;
 	    var match = window.location.search.match(reParam) ;