Added composer support
Merge branch 'master' into TYPO3_6-2

* master:
  Added composer support