update base.html
Merge branch 'ljc_whx_dev' into dev