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

Conflicts:
	templates/include/top-menu.php
Added services
Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	templates/include/top-menu.php
Merge branch 'master' of github.com:ignazas/VAAS into services
Added discount to user. Only admin can modify that
Ignore dynamic image
Merge branch 'master' of github.com:ignazas/VAAS into services
Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	.gitignore
	models/user.inc
	templates/include/top-menu.php
Added chosen component
Added services
Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	helpers/db.inc
	templates/include/top-menu.php
	views/user/view.php
Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	templates/include/top-menu.php
	views/user/view.php
Merge branch 'master' of github.com:ignazas/VAAS into services
Code review
Styles
Added descriptions about prognosis
Merge branch 'master' of github.com:ignazas/VAAS into services
Added finances
Merge branch 'master' of github.com:ignazas/VAAS into services

Conflicts:
	css/styles.css