Merge branch 'master' of https://github.com/freedonaab/Mifushi3D

Conflicts:

	Assets/MidTerm/Import/INDIE_CharPack/Human/Male/MaleCharacter/Materials/MaleCharacter_color.mat
	Assets/MidTerm/Materials/Colors/Blue.mat
	Assets/MidTerm/Materials/Colors/Green.mat
	Assets/MidTerm/Materials/Colors/Red.mat
merge materials (again)
Merge branch 'master' of https://github.com/freedonaab/Mifushi3D