db change
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	doc/db/dormitory.mwb