carrierwave-mongoid added for document upload
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb