update

update
Merge branch 'master' of https://github.com/allengaller/mazi-cms