commit that should not happen
Merge branch 'master' of https://github.com/lioralterman/WakeIt

Conflicts:
	bin/WakeIt.apk
	bin/classes.dex
	bin/resources.ap_
Revert "commit that should not happen"

This reverts commit aed73588a03fb7f826dd2f45dd62565c539ed386.