Conflicts:
	.idea/compiler.xml
	.idea/runConfigurations.xml
	app/src/main/res/mipmap-xxhdpi/icon_gcoding.png
	library_base/version.properties