Changes made that got my local copy running again.
Merge remote-tracking branch 'origin/master' into Jay
Observation Changes
View Observation Meta Data
- Done
- All data shown on wireframe is being displayed
- Just needs styling

ChangeLog
- Changed Edit to View
View Observation
- If category is behavior then no timer information is shown.
New and Edit Observation
- Updated the Professional half of the edit oberservation screen. Needs styling
Edit-Observation
- Got the school controls where they belong on the screen
Observation Record
- Setup observation records to display all record data shown in wireframes
- Created getAnimalByZooID function
- Modified POCO ObservationRecord to use zooid instead of animalid
- added getAnimalByZooID to AnimalProvider and SQLAnimalProvider
Merge remote-tracking branch 'origin/master' into Jay
Merge remote-tracking branch 'origin/master' into Jay

Conflicts:
	CZAOS/CZAOSCore/bin/Debug/CZAOSCore.dll
	CZAOS/CZAOSCore/bin/Debug/CZAOSCore.pdb
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.csprojResolveAssemblyReference.cache
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.dll
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.pdb
	CZAOS/CZAOSMail/bin/Debug/CZAOSCore.dll
	CZAOS/CZAOSMail/bin/Debug/CZAOSCore.pdb
	CZAOS/CZAOSMail/bin/Debug/CZAOSMail.dll
	CZAOS/CZAOSMail/bin/Debug/CZAOSMail.pdb
	CZAOS/CZAOSMail/bin/Debug/CZBizObjects.dll
	CZAOS/CZAOSMail/bin/Debug/CZBizObjects.pdb
	CZAOS/CZAOSMail/bin/Debug/CZDataObjects.dll
	CZAOS/CZAOSMail/bin/Debug/CZDataObjects.pdb
	CZAOS/CZBizObjects/bin/Debug/CZAOSCore.dll
	CZAOS/CZBizObjects/bin/Debug/CZAOSCore.pdb
	CZAOS/CZBizObjects/bin/Debug/CZBizObjects.dll
	CZAOS/CZBizObjects/bin/Debug/CZBizObjects.pdb
	CZAOS/CZBizObjects/bin/Debug/CZDataObjects.dll
	CZAOS/CZBizObjects/bin/Debug/CZDataObjects.pdb
	CZAOS/CZDataObjects/bin/Debug/CZAOSCore.dll
	CZAOS/CZDataObjects/bin/Debug/CZAOSCore.pdb
	CZAOS/CZDataObjects/bin/Debug/CZDataObjects.dll
	CZAOS/CZDataObjects/bin/Debug/CZDataObjects.pdb
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.csproj.FileListAbsolute.txt
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.csprojResolveAssemblyReference.cache
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.dll
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.pdb
	CZAOS/CZDataObjects/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'origin/master' into Jay
Merge remote-tracking branch 'origin/master' into Jay
Added SavedToLocal to Obs.js
Small Patch to CheckPermissions to ignore any api calls
Additional Buttons for View Observation Record and Back
Merge remote-tracking branch 'origin/AdamBranch' into Jay

Conflicts:
	CZAOS/CZAOSWeb/admin/observation/default.aspx
	CZAOS/CZAOSWeb/admin/observation/edit-observation.aspx
	CZAOS/CZAOSWeb/admin/observation/edit-observation.aspx.designer.cs
	CZAOS/CZAOSWeb/admin/observation/view-observation-records.aspx
	CZAOS/CZAOSWeb/admin/observation/view-observation.aspx
	CZAOS/CZAOSWeb/admin/observation/view-observation.aspx.cs
	CZAOS/CZAOSWeb/admin/observation/view-observation.aspx.designer.cs
	CZAOS/CZAOSWeb/assets/scripts/obs_main.js
Fixed Merger Errors
Fixed Merge Errors