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

Conflicts:
bin/Pronus.apk
bin/classes.dex
bin/classes/com/example/pronus/Database.class
bin/classes/com/example/pronus/Editor$1.class
bin/classes/com/example/pronus/Editor.class
bin/classes/com/example/pronus/Intro$IntentLauncher.class
bin/classes/com/example/pronus/Intro.class
bin/classes/com/example/pronus/Login.class
bin/classes/com/example/pronus/SMSService$1.class
bin/classes/com/example/pronus/SMSService$2.class
bin/classes/com/example/pronus/SMSService.class
bin/res/crunch/drawable-hdpi/ic_launcher.png
bin/res/crunch/drawable-mdpi/ic_launcher.png
bin/res/crunch/drawable-xhdpi/ic_launcher.png
bin/res/crunch/drawable-xxhdpi/ic_launcher.png
src/com/example/pronus/Editor.java
src/com/example/pronus/Intro.java
src/com/example/pronus/SMSService.java
Merge branch 'master' of https://github.com/PronusApp/Pronus

Conflicts:
	bin/Pronus.apk
	bin/classes.dex
	bin/classes/com/example/pronus/Database.class
	bin/classes/com/example/pronus/Editor$1.class
	bin/classes/com/example/pronus/Editor.class
	bin/classes/com/example/pronus/Intro$IntentLauncher.class
	bin/classes/com/example/pronus/Intro.class
	bin/classes/com/example/pronus/Login.class
	bin/classes/com/example/pronus/SMSService$1.class
	bin/classes/com/example/pronus/SMSService$2.class
	bin/classes/com/example/pronus/SMSService.class
	src/com/example/pronus/Editor.java
	src/com/example/pronus/Intro.java
	src/com/example/pronus/SMSService.java