Update calendar_controller.rb
Deleted imagemagick package
Merge branch 'master' of http://github.com/fenghuo/FaceCalendar

Conflicts:
	Gemfile
	app/controllers/profile_controller.rb
update group
Merge branch 'master' of github.com:fenghuo/FaceCalendar
snap shot