initial import
Merge branch 'master' of github.com:cupsnow/test27