fixing stuff
Merge branch 'master' of https://github.com/berendbaas/miFold

Conflicts:
	composer.json