The resources can be imported. Problem: The budget in the parent activity is not updated
Added import resources xml file

Conflicts:
	MoonVille/src/spaceappschallenge/moonville/activities/NewGameActivity.java
Just after merge.
Uncommented the showResourcesScreen so that it would not cause the program to crash. Seems like this had been fixed earlier, but it was giving conflict while pulling, so fixed it again.

Conflicts:
	MoonVille/src/spaceappschallenge/moonville/activities/ResourcesActivity.java