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
Added department to user schema, User function for returning all registered users
Requires testing
forgot to commit the db script change
Fixed what the schema update refactoring broke
Inevitable fix of the fix
Inevitable find of the actual bug, and hopefulyl final fix
refactored, added time slot generation for a given window
bug fix
continuing fixes
more fixes