Stub 404/error/handler not found pages
Finish up 404/error/handler not found pages
Uncomment DB configuration
Merge remote-tracking branch 'origin/master' into feature/404-etc

Conflicts:
	app/models/dao/GLobal.scala
Merge remote-tracking branch 'origin/master' into feature/404-etc
Merge pull request #25 from tilius/feature/404-etc

Feature/404 etc