Fixed profile_controller
Merge branch 'master' of http://github.com/fenghuo/FaceCalendar