Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	helpers/db.inc
	templates/include/top-menu.php
	views/user/view.php