namespace fixes
Merge branch 'master' of https://github.com/opus-online/yii2-giimodel

Conflicts:
	Generator.php