debug remove file
Merge pull request #1 from poupotte/master

debug remove file
Merge branch 'master' into mockup

Conflicts:
	server/controllers/files.coffee