Merge pull request #148 from isflorin/dev

Dev
Merge pull request #149 from isflorin/dev

Dev
Merge pull request #150 from isflorin/dev

Dev
Merge pull request #151 from isflorin/dev

Update migrations
Merge pull request #152 from isflorin/dev

Update
A
Merge pull request #153 from isflorin/master

Merge