Add a custom config file for rubocop
Fix rubocop issues
Merge branch 'master' into refactor

Conflicts:
	test/models/location_test.rb
Update Gemfile.lock
Merge branch 'master' into refactor
Merge branch 'master' into bootstrap-3