MERGE
Merge branch 'develop' of https://github.com/JamTeam/WordPress into develop

Conflicts:
	wp-content/themes/HdingLift/index.php
Merge branch 'develop' of https://github.com/JamTeam/WordPress into develop

Conflicts:
	wp-content/themes/HdingLift/index.php