angular-file-upload directive
Merge branch 'master' of https://github.com/ionuts1704/yatm

Conflicts:
	client/app/scripts/controllers/dashboard.js