Merge branch 'hotfix-whitespace' into develop

* hotfix-whitespace:
  fixed white space
Merge branch 'master' into develop

* master:
  fixed amanda Facebook
  hot fix events add amanda Facebook incorrectly
switching to template load
getting closer to template load
added more core and contact info
minor fix
transitioning to template load
FINISHED template load
Merge branch 'feature_templating' into develop

* feature_templating:
  FINISHED template load
  transitioning to template load
  minor fix
  getting closer to template load
  switching to template load

Conflicts:
	htm/cores.htm
Add Danielle
Added more contact, core, and activity info.  Activities valid through the end of the year.
Merge branch 'develop'

# By JMurphs (7) and unknown (1)
* develop:
  Added more contact, core, and activity info.  Activities valid through the end of the year.
  Add Danielle
  FINISHED template load
  transitioning to template load
  minor fix
  added more core and contact info
  getting closer to template load
  switching to template load