Observation Changes

Added View Observation page to teacher folder
Fixed Observation Search erros
Fixed merge errors and fixed edit profile

Also got rid of commented out code in AdminNav.ascx
Got rid of commented code in main.master
All Popups appear to be appropriate sizes
Made count rows wider to show sort arrow
Large chunk of changes

/School/default.aspx is now the districts page
/school/school is the old schools page that is now a modal popup sorted
on district id
Edit links for behaviors and exhibits were added and styled
appropriately
Many Changes

Behavior/Exhibits - made edit buttons for editing child data
Nav now has nav text as a displayed field
Setup view observation records to show n/a if weather information isn't
available
Got rid of the underline on the menu button
Hid the usertype column on masteradmin usergrid
Many changes reference details

View Observaiton Page
- Placed delete control
Main Master Page
- fixed menu
GroupControl
- made it display commonname, housename, and zooid
Animal.cs
- added displayname to class
Merge remote-tracking branch 'origin/master' into AdamBranch

Conflicts:
	CZAOS/CZAOSWeb/admin/observation/default.aspx.cs
	CZAOS/CZAOSWeb/admin/observation/view-observation.aspx
	CZAOS/CZAOSWeb/admin/observation/view-observation.aspx.designer.cs
Prevented the ability to add duplicate data
Fixed default sort expressions
Merge remote-tracking branch 'origin/master' into AdamBranch

Conflicts:
	CZAOS/CZAOSWeb/admin/behavior/behaviors.aspx
	CZAOS/CZAOSWeb/admin/exhibits/default.aspx
	CZAOS/CZAOSWeb/admin/schools/default.aspx
	CZAOS/CZAOSWeb/admin/schools/schools.aspx
	CZAOS/CZAOSWeb/admin/schools/schools.aspx.designer.cs
	CZAOS/CZAOSWeb/controls/GroupControl.ascx
fixed validation on observations
Including needed microsoft.web dll
Merge remote-tracking branch 'origin/master' into AdamBranch

Conflicts:
	CZAOS/CZAOSWeb/assets/css/czaos.css
Changes for deploying to zoo server
Styled timer and added pause button
Style changes to observation pages
Styled Temperature Slider
Bug fixes