Merge pull request #296 from skull132/development

Map Compatibility
Merge pull request #5 from Aurorastation/development

Code Catchup
Jump links

they were not in the right place
Revert

Because WRONG FORK
Jump link location

This should ok to commit, unless you want to change the 2 lines to match
the thing on your side
Merge pull request #297 from SoundScopes/development

Jump link location
Merge pull request #298 from skull132/development

Map Fix 09NOV2014
Merge pull request #299 from Aurorastation/master

Missed Pull
Merge pull request #6 from Aurorastation/development

Development
Yay Updates

Needs fixing:
See how quickly the powernet drains at default load, I thought atmos
went to quickly so I upped the power cell by one level,
Shuttle Tags,
Graphical glitches involving some wires,
There is still some things missing with NanoUI but they are not game
breaking in any way I have seen so far.

Other than that we should be good to go.
Changelog
Merge pull request #300 from SoundScopes/development

Development
Merge pull request #11 from Aurorastation/development

Development