handle conflict
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	index.html
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	index.html
	style/avalon.index.css