Merge branch 'master' into US10
ssong25, hlim10: interaction with db

modified todo, habit, daily
ssong25, hlim10: anoter modification

.
paulkim6 jcheng26: Brush up on Inventory tests
Merge branch 'US10'
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG into US12