CHANGED: Config - Production database settings.
CHANGED: Config - Production database settings.
Initial checkin
CHANGED: Config - Production database settings.
Merge branch 'master' of ssh://git.cloudbees.com/slashgames/slash-tournament

Conflicts:
	.gitignore
	LICENSE
	README.md
	conf/application.conf
	conf/routes
	project/build.properties
	project/plugins.sbt
	public/images/favicon.png
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'