re-organize structure
add AVOS lib
edit user.js
Merge branch 'master' of github.com:elan2wang/iHome
Merge branch 'master' of github.com:elan2wang/iHome
Merge branch 'master' of github.com:elan2wang/iHome
Merge branch 'master' of github.com:elan2wang/iHome
edit user.js
Merge branch 'master' of github.com:elan2wang/iHome
edit welcome
fix conflict
edit welcome