Pokemon materials import
Moves collision with the ground
Moves damage
Moved the in dev attacks
Merge branch 'master' of https://github.com/DamienDoury/Mobamon

Conflicts:
	Mobamon/Assets/Scenes/Maps/Test.unity
	Mobamon/Library/CurrentLayout.dwlt
	Mobamon/Library/CurrentMaximizeLayout.dwlt
	Mobamon/Library/assetDatabase3
	Mobamon/Library/expandedItems
	Mobamon/Library/guidmapper
	Mobamon/Mobamon-csharp.sln
	Mobamon/Mobamon.sln
	Mobamon/Mobamon.userprefs
Merge branch 'master' of https://github.com/DamienDoury/Mobamon

Conflicts:
	Mobamon/Assets/Scenes/Maps/Test.unity
	Mobamon/Library/CurrentLayout.dwlt
	Mobamon/Library/InspectorExpandedItems.asset
	Mobamon/Library/assetDatabase3
	Mobamon/Library/expandedItems
	Mobamon/Library/guidmapper
	Mobamon/Mobamon-csharp.sln
	Mobamon/Mobamon.sln
	Mobamon/Mobamon.userprefs