bump version to 2.0.5
Merge branch 'release/20140804-release' into develop

* release/20140804-release:
  bump version to 2.0.5