These are the few, the proud, the items I think are actually worth sticking in the repo.
Made absolutely sure that the pom.xml file at which there may, at one point, have been the passwords for our keystore, is not part of the next pull request.
This commits my changes to .gitignore to eliminate the possibility of the pom.xml with passwords in it of being uploaded.
This commits the Android Manifest that corresponded to the last
proguard modification.
Merge branch 'dev' of https://github.com/v6/Btc2Sms into dev

Conflicts:
	.gitignore
	mobile/btc2sms/AndroidManifest.xml
	mobile/btc2sms/proguard.conf
	mobile/pom.xml

The above were resolved by direct edits. I am not going to commit mobile/pom.xml, because of potential security issues.
This is more of my fussing to try to get a commit that :

A. Isn't ridiculously complex.
B. Doesn't include any passwords.
C. Will allow Johann to look it over quickly.

Merge branch 'dev' of https://github.com/v6/Btc2Sms into dev

Conflicts:
	mobile/btc2sms/proguard.conf