Merge "Add version.properties file"