Merge branch 'develop' into char-add

I just want that minor tweak from master here
The character is visible, fixed a database issue
Characters are working correctly again
Minor comment tweaks
Merge branch 'char-add' into develop, characters working again