We stack it!
Merge branch 'master' of https://github.com/antale/cms-