Merged character files back
Fixed charactersheet view
Merge branch 'master' into the_great_refactor