Fixed merge function, removed early references to App and updated default endpoints
Merge branch 'master' of https://github.com/wouterbeek/WebQR