commit_michael_005
Merge remote-tracking branch 'origin/master'

Conflicts:
	PhpClassGenerator.v11.suo