fix some introspections, coding style
Merge pull request #652 from havvg/master

fix some introspections
Merge branch 'master' into ormigo

* master:
  fix some introspections, coding style

Conflicts:
	generator/lib/builder/om/ExtensionQueryInheritanceBuilder.php
	generator/lib/builder/om/PHP5ExtensionNodeBuilder.php
	generator/lib/builder/om/PHP5ExtensionNodePeerBuilder.php
	generator/lib/builder/om/PHP5InterfaceBuilder.php
	generator/lib/builder/om/PHP5MultiExtendObjectBuilder.php
	generator/lib/builder/om/PHP5PeerBuilder.php
	generator/lib/builder/om/QueryInheritanceBuilder.php