Merge branch 'ui-template'
Partially adding the featured lanche view
Merge branch 'master' into ui-template