Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
	config/database.yml
Adds database.travis.yml
Merge branch 'develop' of github.com:boersmamarcel/challengesplatform into develop

Conflicts:
	Gemfile.lock
	config/database.yml
Merge branch 'develop' of github.com:boersmamarcel/challengesplatform into develop