Update James Files

Update James Files
Merge branch 'master' of https://github.com/NQuinn27/NCIWorldCupApp

Conflicts:
	WorldCupApp/nbproject/private/private.xml