StephenTown wave setup
Merge branch 'master' of https://github.com/VirsixInc/ZombieRailShooter

Conflicts:
	Assets/Medieval_Toon_Village/Prefabs.meta
	Assets/Medieval_Toon_Village/Source/Models.meta~584ecb241f82b2643c694e9787b04350bc5a88b5.meta
	Assets/Medieval_Toon_Village/Source/Models/Buildings.meta
	Assets/Toon_Level_Kit.meta
-Melee Enemy added
-wave manager updated
Merge branch 'mastcom/VirsixInc/ZombieRailShooter

Conflicts:
	Assets/Dropbox.meta
	Assets/Medieval_Toon_Village/Prefabs.meta
	Assets/Medieval_Toon_Village/Prefabs.meta~eebeb717f906b4cb62e9241d4fbe9f676a192412
	Assets/Medieval_Toon_Village/Source/Models.meta
	Assets/Medieval_Toon_Village/Source/Models/Buildings.meta
	Assets/Medieval_Toon_Village/Source/Models/Buildings.meta~eebeb717f906b4cb62e9241d4fbe9f676a192412
	Assets/Toon_Level_Kit.meta~eebeb717f906b4cb62e9241d4fbe9f676a192412