Trial and error
File uploads
Merge branch 'file_uploads' into saNode

Conflicts:
	packages/users/public/controllers/UserController.js
	packages/users/public/users.js
	packages/users/public/views/profile.html
Initial working image upload and preview