Merge pull request #11 from ClundXIII/master

Some improvements and updates. See commit title for details.
Merge https://github.com/RRZE-Webteam/NavEditor