Research Director Whimsy

I thought I might as well push this, it is getting the same error as the
HoP Whimsy, I'm not sure what to do about that.
Icon fix
Code fix
Research Whimsy

Finally.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS

Conflicts:
	maps/Glloydstation.dmm
Merge branch 'master' of https://github.com/AndroidSFV/UMcS

Conflicts:
	maps/Glloydstation.dmm
Fix stuff

Fixed stuff to be able to pull.
Fix more.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Merge pull request #74 from Nienhaus/master

Research Director Whimsy