Add team members
Merge mockups
Move mockups to doc/