RepeatProcessingException
Такой комит

Conflicts:
	Note/bin/Note.apk
	Note/bin/classes.dex