Made an abstract supermapclass
Removed lost searchcode from branch
Forgot to add the RestoMap file
Merged master into android/resto-widget