Bug fixes
Removed Amateur user type
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
Add/Edit Observation Changes

Allowed date picker to go into the past
Add minutes to time interval label
Changed school observers number to textbox
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.
Observation Filter now toggles filter icon
commented out expiration date and added editusers to enum
Fixed merge error
Fixed messages for User creation/update

Made messages match the style of all other create/update messages in the
system.
Merge remote-tracking branch 'origin/master' into AdamBranch