Merge branch 'master' of https://github.com/cupsadarius/Flake

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/cupsadarius/Flake

Conflicts:
	composer.json