add more file
Merge branch 'master' of https://github.com/pham-thuan-mulodo/test-blog

Conflicts:
	fuel/app/classes/controller/user.php
	fuel/app/logs/2014/10/24.php
custom edit user API again
add comment into code