del unused calendar backbone views
moving ajax from view to model
rename prepare_days
change year,month event's todo
Merge branch 'feature/event_calendar_42' into develop

Conflicts:
	Gemfile
	app/controllers/web/welcome_controller.rb
	app/models/event.rb
	app/views/web/welcome/index.html.haml
fixes main page-68
Merge branch 'develop' of github.com:kaize/castle into feature/edit_union_page-60

Conflicts:
	app/views/web/welcome/index.html.haml
redacting bug 68
Merge branch 'feature/edit_union_page-60' into staging

Conflicts:
	Gemfile
	app/models/event.rb
	app/views/web/welcome/index.html.haml