user profile photos are now uploaded using ajax
Merge branch 'development' of https://github.com/felguerez/aircycle into development

Conflicts:
	web/app/controllers/users_controller.rb