Initial Stripe commit

Stripe payment works
fixed merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath