Merge branch 'master' of github.com:fritzpay/paymentd into payment_method_api
Merge branch 'master' of github.com:fritzpay/paymentd into payment_method_api
Merge branch 'master' of github.com:fritzpay/paymentd into payment_method_api
Merge branch 'web_service' of https://github.com/wongak/paymentd into webserver
added html serving for amdin gui elements to fullfill same origin policy
added some comments and check if serveadmin is active for www gui
Merge pull request #52 from chruffer/webserver

admin gui webserver