Misc. bug fixes
Merge branch 'master' of https://github.com/archonproject/archon

Conflicts:
	packages/subjects/pub/subjects.php
Merge pull request #23 from gjerdery/master

Evaluate Subject List template/ fix subject nav div id