Merge remote-tracking branch 'origin/master'

Conflicts:
	app/grape/api_user.rb
	app/grape/entity/user_entity.rb
Merge remote-tracking branch 'origin/master'