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
Merge remote-tracking branch 'origin/master' into AdamBranch
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
Add/Edit Observation Changes

Allowed date picker to go into the past
Add minutes to time interval label
Changed school observers number to textbox
Behavior/Defaults.aspx

Changed Page title to Manage Behaviors
Merge remote-tracking branch 'origin/master' into AdamBranch
List of edits

Nav has ability to add observer to permissions now
All bixobjects files have changed sortexpressions to not watch for sort
order now
Mass amount of changes, see details

Added values to mainbase to check if user is observer, admin, or
eduadmin.

Removed the ability to modify sort order from behaviors, behavior
categories, and locations.
Setting up filter icon to match filter status in observation list
screen.
Rearranged observation list tabs to show upcoming obs first.
Renamed eduadmin tab in users page to eduadmin instead of teachers.
Updating css to work with filter in observation list screen.
Bug fixes
Observation Filter now toggles filter icon
commented out expiration date and added editusers to enum
Merge remote-tracking branch 'origin/master' into Jay

Conflicts:
	CZAOS/CZAOSWeb/admin/observation/edit-observation.aspx
Removed Amateur user type
Merge remote-tracking branch 'origin/master' into Jay

Conflicts:
	CZAOS/CZAOSWeb/admin/behavior/default.aspx
Observation Changes

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

Also got rid of commented out code in AdminNav.ascx