* corrrect tests
* modify template for basic Mokos's generation
Merge branch 'master' of https://github.com/tomascejka/mokos

Conflicts:
	src/test/php/Mokos/Generator/GeneratorBaseTest.php