Merges the Event and Calendar features.
Adds the Tags taxonomy term to the Basic Page content type.
Merge branch 'feature/contenttypes' of github.com:cosmicdreams/OWC5 into feature/homepage

Conflicts:
	sites/all/modules/custom/content_type_event/content_type_event.info