Reverted
Merge branch 'master' of https://github.com/ignazas/VAAS

Conflicts:
	.gitignore
	calendar/const.inc
	functions.php
	helpers/db.inc
	helpers/strptime.inc
bad commit
Merge branch 'master' of https://github.com/ignazas/VAAS

Conflicts:
	index.php