Merge branch 'release/cedric_vs_sideshow'
Merge branch 'release/merged_mockup'
promotional codes crud
corrected rspec failures
Merge branch 'develop' into feature/cp-promotional_codes
Merge branch 'MiguelGomes-dev' into develop
Merge branch 'release/new_release'
fixed gemspec readme name
Merge branch 'hotfix/gemspec'
Merge branch 'hotfix/gemspec' into develop
o cedric é nabo
Merge branch 'hotfix/better_errors'
Merge branch 'hotfix/better_errors' into develop
fixed better_errors
Merge branch 'hotfix/better_errors2'
Merge branch 'hotfix/better_errors2' into develop
o t-bag é ainda mais estupido que o cedric
Merge branch 'release/tbag_nabo'
fixed more tbag stuff
Merge branch 'hotfix/tbag'