Fixed user.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/user.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed file upload error.