Merge branch 'dev' of https://github.com/sheedy/ux-prototype into dev