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
lesson create
fix conflict
gui anh viet
Merge branch 'master' of https://github.com/hoangdd/7maru