add combine
fix form recursion bug, update color/grid/font/demo
Merge branch 'master' of github.com:etaoux/brix
update form
grunt update
Upgrading grunt from v0.3 to v0.4
Merge branch 'master' of https://github.com/etaoux/brix
update grunt
fixed brick class name
add property component
Merge pull request #49 from wencheng0503/master

add morelink and infoblock
fixed some bug
Merge branch 'master' of https://github.com/etaoux/brix
grunt
add autoBrick config
update gruntfile
update brix tmpl demo
将组件的模板写在单独的html文件中.
update iconfont
fix base bug