modifications to trotter recommend
Merge branch 'development' of https://github.com/socrex/byopapp-api-stage into development