Commit
Eliminata
Merge branch 'master' of https://github.com/PronusApp/Pronus

Conflicts:
	bin/Pronus.apk
	bin/classes.dex
	bin/classes/com/example/pronus/ConversationList$1.class
	bin/classes/com/example/pronus/ConversationList$2.class
	bin/classes/com/example/pronus/ConversationList$3.class
	bin/classes/com/example/pronus/ConversationList$4.class
	bin/classes/com/example/pronus/ConversationList$5.class
	bin/classes/com/example/pronus/ConversationList.class
	bin/classes/com/example/pronus/Editor.class
	bin/classes/com/example/pronus/SMSService$1.class
	bin/classes/com/example/pronus/SMSService$2.class
	bin/classes/com/example/pronus/pickContact.class
	bin/resources.ap_
	src/com/example/pronus/ConversationList.java