Adds the E-Magazine Newsletter content type.  Also adds the Automatic Node Titles module.
Adding the Calendar module as a dependency to the Event feature.
Merge remote-tracking branch 'origin/feature/contenttypes' into develop

Conflicts:
	sites/all/modules/contrib/auto_nodetitle/README.txt
	sites/all/modules/contrib/auto_nodetitle/auto_nodetitle.install
Merge branch 'develop'