foo
Merge branch 'master' of https://github.com/bazzline/zend_framework_2_locator_generator

Conflicts:
	.idea/zend_framework_2_locator_generator.iml
updated