Dexters current location changes and mock icon stuff
merged DexterBranch and master ... some errors occurred