basic markup
Merge branch 'markup' into dev

* markup:
  basic markup
pushing, might not get on it again until tonight
Merge branch 'tabs' into dev

* tabs:
  pushing, might not get on it again until tonight