Merge origin/first_branch

Conflicts:
	controllers/del.js
	controllers/gen.php
	models/adb.php
	models/login_class.php
	views/index.php
	views/schedule.php