Fixed sorting by animal-region and behavior count
Edit Observation Changes

Removed the ability to choose behavior for obs type
Removed the ability to choose manual obs
Removed the ability to not show timer
Moved animal list box to left under region
Moved exhibit dropdown to right of region
Number of changes to edit and view observation

Changed time max length to 8
Hid unnecessary items from school view observation
Merge remote-tracking branch 'origin/master' into Jay

Conflicts:
	CZAOS/CZAOSWeb/admin/observation/edit-observation.aspx