Update Code package
Fix CS
Minor improvements
CS fixes and reverting changes
Merge branch 'update-code-package' of git://github.com/neeckeloo/zf2 into hotfix/3297

Conflicts:
	library/Zend/Code/Generator/ClassGenerator.php
	library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
	library/Zend/Code/Generator/DocBlockGenerator.php
	library/Zend/Code/Generator/FileGenerator.php
	library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
	library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
	library/Zend/Code/Reflection/FunctionReflection.php
	library/Zend/Code/Scanner/ClassScanner.php
	library/Zend/Code/Scanner/MethodScanner.php
	library/Zend/Code/Scanner/TokenArrayScanner.php
	tests/ZendTest/Code/Generator/ClassGeneratorTest.php
Merge branch 'hotfix/3297' into develop

Close #3297