in progress
	modified:   app/controllers/targets_controller.rb
	modified:   app/models/user.rb
Merge branch 'feature/ping' into develop