Update branch xubi, insert homepage module
Update Homepage module
Merge branch 'master' into xubi
Fix conflict when pull github