Merge pull request #359 from gogoyqj/master

修改ui=>oni,touch => amd
finish check
Merge branch 'master' of https://github.com/RubyLouvre/avalon.oniui.git