Merge branch 'develop'
re-export Web.Apiary from Web.Apiary.Heroku.