Merge remote-tracking branch 'origin/master' into AdamBranch
Merge remote-tracking branch 'origin/master' into AdamBranch
Bug fixes
Removed Amateur user type
Merge remote-tracking branch 'origin/master' into AdamBranch
Changed the saving of records at end of intervals
Displaying HouseNames and ZooID on observations
Html Decoded Strings that are encoded in database
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/Jay'

Conflicts:
	CZAOS/CZAOSWeb/assets/css/czaos.css
Merge remote-tracking branch 'origin/master' into Jay