Few issues fixed
Merge branch 'master' of https://github.com/ncyclo/ncycloapp.git