Commit to sync
Merge branch 'developer' of https://github.com/IlkaKokemor/CampusInfo into developer

Conflicts:
	CampusInfo1/.DS_Store