le fu
Merge branch 'master' of
https://github.com/delleceste/ecosmartscreenon.git

Conflicts:
	src/it/giacomos/android/ecosmartscreenon/service/EcoScreenService.java
	src/it/giacomos/android/ecosmartscreenon/service/StateActive.java