DB instead WS
Merge branch 'master' of https://github.com/dupdup/nesil

Conflicts:
	app/controllers/Application.java