Updating the application version.
Merge branch 'master' into android-assets