begin global header and footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/plugins/camp-o-matic/views/app.php
	wp-content/plugins/camp-o-matic/views/login.html
begin global header and footer