bump version to 2.0.4

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

* release/20140626-release:
  bump version to 2.0.4