bug fix #237
naming changes
indetation fix
Merge branch 'master' of git://github.com/akeneo/MagentoConnectorBundle

* 'master' of git://github.com/akeneo/MagentoConnectorBundle:
  Update from RC6 to RC7