Added save/load functionality.
Merge branch 'master' of git@github.com:Josvanegmond/androidmoonbase.git

Conflicts:
	MoonVille/src/spaceappschallenge/moonville/activities/MainMenuActivity.java
	MoonVille/src/spaceappschallenge/moonville/activities/NewCompanyActivity.java