user photo replaced with carrierwave upload
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/controllers/users_controller.rb