Merge branch 'master' into sapphire_14_01_acu145805_more_better_activity_service

Conflicts:
	Gemfile.lock