Update from zhixin
Merge branch 'master' of https://github.com/krongk/rain-cms