Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity
