Changed upstream for D:P:Database
Merge branch 'history-journal' of https://github.com/ksyz/PowerTango into history-journal