Tests reactivated
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/Gemfile.lock