Fixed bug from CMS
Merge branch 'master' of https://github.com/tonysh518/lily_official
Merge branch 'master' of https://github.com/tonysh518/lily_official