Update front
Merge pull request #131 from isflorin/dev

Update front