Merge pull request #12 from stephandev/master

Changed the typo of the datalink states to fit the other textfields
Bug fixes.
Bug fixes and added other ATC to map.
Merge pull request #28 from mshamash/master

Bug fixed and ATC on map!