fixed
Merge remote-tracking branch 'origin/fixTitleAndIcon' into dev