Merge branch 'master' of https://github.com/bucifer/navctrl
Merge branch 'master' of https://github.com/bucifer/navctrl