Hotfix 20JUL2014

Bluespess Tech and the map.
Merge pull request #187 from skull132/master

Hotfix 20JUL2014
Merge pull request #188 from Aurorastation/development

Hotfix 20JUL2014