added my keystore so I don't loose it, no you can't have the password.
Merge remote-tracking branch 'origin/develop' into develop