fixes
Merge branch 'master' of https://github.com/bjorngrunde/FL

Conflicts:
	composer.json
yes