Added users view updates and groups
Merge branch 'master' of https://github.com/westleyrussell/SPGammaIota

Conflicts:
	SigmaPi/PubSite/templates/history.html
	SigmaPi/static/css/pub_common.css