changes
Merge branch 'master' of https://github.com/zuzle/crazylionwp
changes