fixed typo
fixed big bug
Merge remote branch 'origin/newtheme' into dev
Merge remote branch 'origin/newtheme' into dev
Merge remote-tracking branch 'origin/dev' into newtheme
added fix