data
data
Merge branch 'master' of https://github.com/hemze/lagidze

Conflicts:
	public/js/tinymce/jscripts/tiny_mce/plugins/ajaxfilemanager/session/gc_counter.ajax.php