made file uploads directive
Merge branch 'master' of https://github.com/jivoinm/theBOSS

Conflicts:
	app/scripts/controllers/orders.js