committing changes
Merge branch 'master' of github.com:easyNav/easyNav-server