switching to template load
getting closer to template load
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