Complete Search and Teacher's Lesson Manage page
Merge branch 'master' of https://github.com/hoangdd/7maru
git fix conflict

Conflicts:
	app/webroot/css/common.css
Merge branch 'master' of https://github.com/hoangdd/7maru
Merge branch 'master' of https://github.com/hoangdd/7maru
update controller register teacher
fix register teacher controller
update database
Update table user struct
update phan login ho Viet
Merge branch 'master' of https://github.com/hoangdd/7maru

Conflicts:
	app/Model/User.php
	tables.sql
dang kis
Merge branch 'master' of https://github.com/hoangdd/7maru
update database sample
Merge branch 'master' of https://github.com/hoangdd/7maru
commit admincontroller
test
test
login va user manage
commit database