bag fix
bag fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/project/block/property.styl