Merge branch '2-2-stable'
Got rid of unnecessary css
Merge branch 'master' into 2-2-stable