Fixed button styling
Style and Funcationality Changes

TeacherPage
- link to view records
AdminPermissionsModule
- edited to allow access to only record page given correct password and
username
Animals and Animal-Regions
- removed the ability to edit or delete data
Touched up changes to icons and the Delete functionality
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/master' into Jay
Display error when observation isn't found
commented out expiration date and added editusers to enum
Merge branch 'Jay' of https://github.com/eric-citizen/AOS into Jay

Conflicts:
	CZAOS/CZAOSWeb/controls/UserGrid.ascx.cs
Fixed Merging Errors
Merge remote-tracking branch 'origin/Jay'
Small Series of Fixes

Styled Unlock Button Appropriately,
Fixed UserGrid
Added Fix Ken Suggested for EmailTrackingList
Commented out UnlockUser call.
Merge remote-tracking branch 'origin/Jay'
Merge remote-tracking branch 'origin/master' into AdamBranch

Conflicts:
	CZAOS/CZAOSWeb/ProfessionalPage.html
	CZAOS/CZAOSWeb/teacher/view-observation.aspx.designer.cs