code cleaning, add files upload and file management (wip)
Merge branch 'master' of https://github.com/chriscx/Fluid

Conflicts:
	client/app/controllers/admin/FilesController.coffee
	client/app/views/admin/files/uploadFile.jade
	client/public/controllers/admin/FilesController.js
	client/public/views/admin/files/uploadFile.html
	server/app/models/file.coffee
	server/app/routes.coffee
	server/lib/models/file.js
	server/lib/routes.js
wip hash id fix, file upload dir, etc