no message
Merge branch 'master' of https://github.com/Pekerel/TESTER

Conflicts:
	Eternal lullaby/Eternal Lullaby Awakening/Assets/Animations/Man/Materials/Screenshot 2014-05-19 17.53.11.png.meta