Clean code
Merge branch 'master' of github.com:oyagev/Sweatshop
Update composer libs versions