Merge with version 3.1

Conflicts:
	public/template-tags/loop.php
Merge version 3.2

Conflicts:
	lib/tribe-template-factory.class.php
Merge version 3.3
Merge version 3.3.1
Merge version 3.4
Merge version 3.4.1
Version 3.5
Merge version 3.5