bump version to 3.1.0
Merge branch 'release/20130911-release' into develop

* release/20130911-release:
  bump version to 3.1.0