use elastica
Merge branch 'master' into develop

* master:
  use elastica
Merge branch 'develop' of git://github.com/wimvds/KunstmaanBundlesCMS into develop

* 'develop' of git://github.com/wimvds/KunstmaanBundlesCMS:
  fix composer