Updated build and version number
Merge build and version number from master into single-city