major update

large changes in editor
Merge branch 'master' of https://github.com/Nazgard/college

Conflicts:
	web/hw/4/.DS_Store
	web/hw/4/admin/edit_day.php
	web/hw/4/css/bootstrap.min.css
	web/hw/4/index.php