Merged from master

Fixed merge conflicts with merge from master
Added DB functionality to character creation and level up

Added updateCharacter, addCharacter, and addItem functions.  Still needs
debugging