merge git stuff
update apk (dev build)