more tests
Merge branch 'master' of https://github.com/yupe/yupe
theme fix
fix composer.json
#359
Merge branch 'master' of https://github.com/yupe/yupe