Updated comments
Added some new classes
Merge branch 'develop' into routing/ImproveRouteFlexibility

Conflicts:
	tests/phpunit.xml.dist