begin removing stuff that should be in a gem
Merge branch 'master' into refactor-statitics

Conflicts:
	app/assets/javascripts/rails_admin/custom/ui.js.coffee
further refactoring
Merge branch 'master' into refactor-statitics

Conflicts:
	app/models/location.rb
	app/models/user.rb
finalize refactoring for now: only enable for main models