Merge branch 'feature/frontend' of github.com:cosmicdreams/OWC5 into feature/homepage
Merge branch 'feature/contenttypes' of github.com:cosmicdreams/OWC5 into feature/homepage

Conflicts:
	sites/all/modules/custom/content_type_event/content_type_event.info
Merge branch 'develop' of github.com:cosmicdreams/OWC5 into feature/homepage

Conflicts:
	sites/all/modules/custom/content_type_event/content_type_event.info
Merge remote-tracking branch 'origin/feature/homepage' into develop