updated version to 2014082600
Merge branch 'release-2014082600' into develop