#minor change
Merge branch 'master' of https://github.com/revolutionarysystems/stripe

Conflicts:
	client-osgi/target/classes/META-INF/MANIFEST.MF