Merge branch 'release/20140617-release' into develop

* release/20140617-release:
  bump version to 2.0.3
removed integration test app
rename .env template to be included when packaging
integrate after content tags as late as possible
don't require the root_path to be configured
bump version to 2.0.4

* update changelog
* bugfix: remove cms_root_path
Merge branch 'release/20140626-release'

* release/20140626-release:
  bump version to 2.0.4
  don't require the root_path to be configured
  integrate after content tags as late as possible
  rename .env template to be included when packaging
  removed integration test app