Update #2
Merge remote-tracking branch 'origin/master'

Conflicts:
	root/style.css
	root/style.less