Merge pull request #93 from RubyLouvre/master

update oniui
update smartgrid
Merge pull request #333 from shirlyLoveU/master

update smartgrid