Sync with webapp-launcher and bring everything back to life

Signed-off-by: Simon Busch <morphis@gravedo.de>