8
*
o
o
remove
Merge branch 'master' of https://github.com/tomascejka/mokos

Conflicts:
	.gitignore
	composer.json
	composer.lock
	composer.phar
	config/generate.ini
	src/main/php/Mokos/Generator/BaseGenerator.php
	src/main/php/Mokos/Model/Dao/BaseDao.php
	src/main/php/Mokos/Model/Dao/Dao.php
	src/main/php/Mokos/Model/Dto/Dto.php
	src/main/php/Mokos/Model/Mapper/Mapper.php
	src/main/php/Mokos/Template/Template.php
*
Merge branch 'master' of https://github.com/tomascejka/mokos
Merge branch 'master' of https://github.com/tomascejka/mokos

Conflicts:
	composer.json
*remove