Merge branch 'release/0.0.4'
Add resolver for play-slick
Merge branch 'hotfix/0.0.4-1' into develop

Conflicts:
	package.json
	project/Build.scala