uploadManager
Merge branch 'master' of https://github.com/Expyron/jawfish-client

Conflicts:
	build/app.js
	build/app.min.js
	js/controllers/mainController.js
	public/script.js