Solved some lint errors
Merge branch 'master' of github.com:joninvski/EnergyTimes

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties