Merge branch 'db_refactor' of git://github.com/Twentyone/nerdz-template-stillblack

Conflicts:
	langs/it/json/default.json
Merge branch 'master' of git://github.com/Twentyone/nerdz-template-stillblack
Fixes interactions