Merge pull request #58 from RubyLouvre/master

update
complete smartgrid
Merge pull request #59 from RubyLouvre/master

update
update avalon
update avalon
update smartgrid
resolve confilict
Merge branch 'RubyLouvre-master'
Merge pull request #278 from shirlyLoveU/master

update smartgrid