Commit of a mixed reset of this branch to hard reset master
Merge branch 'feature/foundation5' of https://github.com/thingles/foreground into feature/foundation5