bumps version
Merge branch 'release/20130414-release' into develop

* release/20130414-release:
  bumps version