initial merge with master
cleanup and fix of broken app.mk from master
all merged