Removed '__hack_doctrine_orm__'
Removed extra spaces
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DependencyInjection/Compiler/AddTemplatesCompilerPass.php
Merge pull request #180 from miklos-martin/master

Removed '__hack_doctrine_orm__'