Merge branch 'master' into backend-init
conflict fix
Merge branch 'master' into backend-init

Conflicts:
	wp-content/themes/hb/collaborations/collaboration-collaborators.php
	wp-content/themes/hb/includes/archive.php
	wp-content/themes/hb/includes/gallery.php
Merge branch 'master' into backend-init
fixed menu highlighting issue

iPad Markup change-order
Merge branch 'backend-init'