Thread search behaviour
UI Bugfixes
Annotation and Session Handling improvements
Adding back annotation code
Annotation and session improvements
Session expiry fix
Prop files
ignore
prop
Merge branch 'master' of https://github.com/compbio-UofT/medsavant

Conflicts:
	.gitignore
	MedSavantClient/.medsavant.prop
	MedSavantClient/nbproject/private/private.xml
	MedSavantServerEngine/src/org/ut/biolab/medsavant/server/db/ConnectionController.java
	MedSavantShared/nbproject/private/private.xml