Demo... Very poor actually...
Merge branch 'master' of https://github.com/jackguo/FaceCalendar

Conflicts:
	config/routes.rb