Fixed bugs from meeting
Merge remote-tracking branch 'origin/develop' into develop-basal-character