develop
Revert "develop"

This reverts commit 4cc69d416bf4927f7d9873d9d898ddfb364d75c8.
Revert "Revert "develop""

This reverts commit 5c19da715b27c47fa1edc2457558eac4a01b5ee0.
Merge branch 'master' of https://github.com/jupitern/cms