Fixed various things, newgame, loadgame, bug fixes

#newgame doesnt load preference upgrades
#resumegame does
#upgrades are always saved after pressing check button, even if empty
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/edu/uark/csce/tilebreaker/MainActivity.java
	app/src/main/java/edu/uark/csce/tilebreaker/TileBreakerActivity.java
	app/src/main/java/edu/uark/csce/tilebreaker/UpgradeActivity.java