Update IDE
Merge branch 'master' of https://github.com/gt212345/EVmonitor

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties