Fixed navbar cart link; reindent js files
Merge branch 'caple7'