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

Conflicts:
	bin/Pronus.apk
	bin/classes.dex
	bin/classes/com/example/pronus/PasswordUpdater.class
	bin/resources.ap_