Merge branch 'master' into production
set compile option produciton environment
execute db:migrate after Heroku deploy