controller ok
Merge branch 'master' of ssh://git@github.com/SmartNav/SmartNavigator.git