clear
Remedy floating issue
Not part of floating issue
Merge branch 'anythink-theme' into anythink-theme-master
Bring in changes from develop branch manually
Merge branch 'anythink-theme-master' into anythink-theme