fetching
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scss/_settings.scss
json and minor fixed

new json and minor fixed
background zhang
fixing gruntfile
Merge branch 'brassy--master'