Merge branch 'master' into drew
fixed navigation
Merge branch 'drew'