Options in BankingServer + PayPalServer changed
Merge branch 'master' of https://github.com/Alonai/TralalaServer.git

Conflicts:
	build.xml