Sync with Fritz

Sorry for the monster pull request ... will use branches now.
Reverted to localhost in qx-mojo-app