Added proguard
Merge branch 'master' of github.com:joninvski/EnergyTimes

Conflicts:
	app/build.gradle