Working on how Power Up manager handles lists.  Fixed errors in
generating initial locations.
Merge branch 'master' into ItemsWithInventory

Conflicts:
	minimap.png