conflict test
conflict test
more conflict tests
still trying to cause merge problems
Merge branch 'stas' into back

Conflicts:
	src/classes/Database.php
refactored event to use EventDate more
refactoring bug fixes
constructor fix
hopefully final bug fix
ever notice how you think you fixed a problem but in reality you have to fix like three more things after
According to my prediction there is still something wrong
Merge branch 'back'