Merge branch 'develop'
Merge branch 'master' of heroku.com:sigi-test into develop

# Via afrancoc2000
* 'master' of heroku.com:sigi-test: