Merge "add version.properties file"