Theme updates - BID-3415
Merge branch 'master' of github.com:apigee/apigee_drupal_devconnect_theme

Conflicts:
	template.php