Merge pull request #2 from lightergrey/dev

Dev - use markup from prototype
Revert "Merge branch 'profile-page-markup' into dev"

This reverts commit 3486e963886cd0d05ae67b4fd263520c62a9f10d, reversing
changes made to 3c6671d66801a2f691612a9fffba72257e213a7f.
Merge remote-tracking branch 'upstream/dev' into dev
merge upstream