Adding the mockups to github
Merge branch 'ui'