version 20131110 16:45
修改关注，与头像上传整合
version 20131110 16:46
删除一个view，与version 20131110 16:45
Merge branch 'master' of https://github.com/scutLaoYi/blog
欠院长版本整合
Conflicts:
	Controller/UsersController.php