Stage 2 2/27/14
Merge branch 'master' of https://github.com/james7132/Hysteria

Conflicts:
	Assets/Demo/Scenes/Attack Pattern Test.unity
	Assets/Demo/Stage 1/Stage 1.prefab
	Assets/Demo/Stage 2/2 Midboss.prefab
2/27/14 Merge