Merge branch 'master' of C:\Users\yin\PhpstormProjects\SenseCMS with conflicts.
User