upload, backtotop, phone helper
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/helpers/users_helper.rb