merge code
update
Merge branch 'master' of https://github.com/cpk/ckmn_filemanager

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log
Update user