this is merging commit
Merge branch 'master' of http://github.com/sadekj/paypalbattlehack

Conflicts:
	.gitignore
	project.properties