Integration
Merge branch 'master' of github.com:zhangce/Elementary_0.2