re-make framework
Merge branch 'make_framework' into develop

Conflicts:
	app/Model/Answer.php
	app/Model/Category.php
	app/Model/Lesson.php
	app/Model/LessonDetail.php
	app/Model/User.php
	app/Model/Word.php
	app/View/Layouts/bootstrap.ctp