Merge branch 'develop'
Change import path from mateusbraga/freestore to gihub.com/mateusbraga/freestore
Merge branch 'master' into develop