Cornelis upate 6 may 7pm
Merge branch 'master' of https://github.com/taiyode/HistoryWebApp

this merge is necessary for updates