final changes
Merge branch 'master' of https://github.com/vlead/ui-1.0-toolkit