Merge pull request #130 from isflorin/dev

Merge branch 'master' into dev
Merge pull request #131 from isflorin/dev

Update front
Merge pull request #132 from isflorin/dev

Update
composer
Merge pull request #133 from isflorin/master

Merge