Calendar
Merge branch 'develop' of github.com:kfc/klicango into develop

Conflicts:
	profiles/drupal_commons/themes/commons_origins/styles/custom.css
	profiles/drupal_commons/themes/commons_origins/template.php
	sites/all/modules/custom/customization/customization.module