bug fixes and documentatoin
Merge branch 'master' into UCSD

Conflicts:
	Website/ORNG/shindigorng.war
	Website/SourceCode/Profiles/Profiles/Web.config
Link to HR edit page