jjung

(cherry picked from commit d0090e826bd89e99ddfd0e0f259376932f1b0342)

Conflicts:
	src/less/variables.less