设置background不再自动转换backgroundColor
Merge branch 'master' of github.com:RubyLouvre/avalon

Conflicts:
	avalon.js
	avalon.modern.js