modify color
Merge branch 'master' of https://github.com/cliping/horizon-nfschina into cliping-master

Conflicts:
	theme/css/ubuntu.css