Incrementing the version code.
Merge branch 'master' into android-assets