Version 3.1
Version 3.2
Version 3.3
Version 3.3.1
Version 3.4
Version 3.4.1
Version 3.5
Merge branch 'upstream'

Conflicts:
	lib/the-events-calendar.class.php
	lib/tribe-settings.class.php
	lib/tribe-template-factory.class.php
	lib/tribe-view-helpers.class.php
	public/template-tags/loop.php