CSS transitions and layout changes
Merge branch 'master' into testlayout2
merging