Changed package name from apkmapp into dist
small changes
fixed merge