Asset/Code Cleanup

Switched most assets to sprite sheets
Some general code cleanup
More code cleanup
Merge remote-tracking branch 'upstream/master' into dev
Updated Shop UI + New Image Loading Method

The shop UI has been updated:
	-New background
	-Buttons match the new main menu UI
	-Booster images updated
	-Font now matches the main menu
	-'g' replaced by the gold icon
	-Popup box shows large pictures of cards when a pack is bought

New Image Loading Method
	-Transferred most images to sprite sheets
	-Images (other than null.png) are now loaded in by AssetLoaders
	-Moved all images from root into the assets folder
	-The last argument of makeButton now takes a texture, loaded by
	the asset loaders or otherwise
Merge remote-tracking branch 'upstream/master'

Merge with latest from upstream
All conflicts resolved
Gave Demigods Names

Tried to give names to each demigod based on the contents of thier decks
Added Randomized Names for Non-Demigod AI

Also slightly adjusted in-battle foe name text.
Changed Demigod Names

Osiris -> Anubis
	-Avoid confusion with the false god Osiris from EtG
Merge pull request #6 from SethKips/master

Updated Shop UI + New Image Loading Method