fix conflict
Merge branch 'master' of github.com:zuha/Blogs-MultiUser-Zuha-Cakephp-Plugin