various updates

-added a working healthbar
-worked on the scent reave
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/CurrentMaximizeLayout.dwlt
	TeamBravoProject/Library/InspectorExpandedItems.asset
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/11/113d8f67db4aa79409dddc94f56d858c
	TeamBravoProject/Library/metadata/46/465844740b5921845a3e067f6f8abd8a
	TeamBravoProject/Library/metadata/75/75d2fd8cc02df984b835e4a58e16dd91
	TeamBravoProject/Library/metadata/96/96795ee2ca194094b9904e0554ccdf9c
	TeamBravoProject/Library/metadata/a8/a89d154a75b24ca45b933b853f06b4b8
	TeamBravoProject/Library/metadata/b0/b00ff530700fdad4dbc60f4bd7e48996