Fix: Enable ZendDeveloperTools in development mode
Enhancement: Require bjyoungblood/BjyProfiler as dev dependency
Enhancement: Also enable database profiling tab in development mode
Fix: Run phpunit as installed with Composer
Fix: Service (as it is) doesn't need a factory
Merge pull request #259 from localheinz/fix/service-definition

Fix: Service (as it is) doesn't need a factory
Merge pull request #258 from localheinz/fix/phpunit

Fix: Run phpunit as installed with Composer on Travis
Merge pull request #247 from localheinz/fix/enable-toolbar-in-development-mode

Fix: Enable ZendDeveloperTools in development mode
Fix: Remove unused services
Merge pull request #220 from localheinz/bugfix/unused-service

Fix: Remove unused service factory
Merge pull request #3 from zendframework/master

fork sync
Merge branch 'master' into fix/factories

Conflicts:
	module/ZfModule/src/ZfModule/Module.php