Merge branch 'paypal'

Conflicts:
	.gitignore
	SankyNet/API/README.md