inception commit
Merge branch 'master' of https://github.com/jurajzachar/play2-scala-template

Conflicts:
	.gitignore