Implemented:
- /api/files
- /api/image
Merge branch 'master' of https://github.com/couchtape/couchtapeapp

Conflicts:
	grunt.js