calendar controls
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/helpers/access_helper.rb
	app/views/shared/_header.erb
Merge branch 'master' of /home/andrew/RubymineProjects/RP2 with conflicts.