sync
Merge remote-tracking branch 'origin/wes' into tal
adding nav
Merge remote-tracking branch 'origin/tal' into jeff