Master, from work
Merge github.com:kspector/sample_app into filling-in-layout
Added links