Merge pull request #74 from Aurorastation/development

22APR2014
Merge pull request #76 from Aurorastation/development

MAP E_FIX
Merge pull request #78 from Aurorastation/development

MAP FIX
MAP E_FIX
Merge pull request #79 from skull132/master

MAP E_FIX
MAP FIX
Merge pull request #80 from skull132/master

MAP FIX
Merge pull request #81 from Aurorastation/master

MAP fixes