Initial commit
Merge remote-tracking branch 'github/master' into ui_mockup