major codefix for apicalls in app and router
Merge branch 'master' of github.com:Oted/BMAP