Merge branch 'master' into development
Change quantity package to integer on Product model
Change translation titles of controllers
Merge branch 'development'