half implement fb, aaron do rest
Merge branch 'master' of https://github.com/mwong56/WayPal

Conflicts:
	project.properties