Merge branch 'master' into develop
Merge branch 'master' into develop
fix 5
Merge branch 'feature-check-shop-select' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/checks_controller.rb
fix 6
Merge branch 'develop'

Conflicts:
	db/development.sqlite3