merge from master
Merge branch 'master' into filling-in-layout
layout and styles
user signup skeleton