utf edits
doc change
Merge branch 'sprint15' into tom
old change on mac
mac update
Merge branch 'sprint16' into tom
sam description page
finish sam model description
app .yaml update