Merging versions
Merge branch 'master' of https://github.com/molenterprise/cms_synth