Use more variables
Improvments
Improvments
Merge branch 'feature-test-graphic'

Conflicts:
	Gruntfile.js
	css/bootstrap.css
	css/main.css
	less/bootstrap.less
	less/main.less
	less/variables.less