Add category
Minor fix
Teacher Create Juugyou
Merge branch 'master' into thinhnv

Conflicts:
	app/Controller/LessonsController.php
	app/Controller/TeachersController.php
	app/Controller/UsersController.php
	app/Model/Category.php
	app/Model/Lesson.php
	app/View/Layouts/default.ctp
	app/webroot/js/inputcheck.js