Initial Commit
Merge branch 'master' of github.com:kennethzfeng/scala-play-demo into dev

Conflicts:
	.gitignore
Merge branch 'dev'