3/7/14 Update
Merge branch 'master' of https://github.com/james7132/Hysteria

Conflicts:
	Assets/Demo/Prefabs/Static Objects/Game Object Manager.prefab
	Assets/Demo/Scenes/Attack Pattern Test.unity