[WIP] Load apps proper master

@karlitschek @icewind1991 @blizzz