file generati
Merge branch 'master' of https://github.com/piercosta/android.git

Conflicts:
	AntiTheft/bin/classes/it/unibo/antitheft/AlarmActivity.class
	AntiTheft/bin/classes/it/unibo/antitheft/R$string.class
	AntiTheft/bin/classes/it/unibo/antitheft/R$style.class