Collision and sprite changes
Merge branch 'master' of https://github.com/shanemarks/EvilOverlord

Conflicts:
	unity/Assets/prefabs/UI.prefab
	unity/Assets/prefabs/animationPrefabs/TextPopup.prefab
	unity/ProjectSettings/Physics2DSettings.asset