content and jade template fix
Merge branch 'upgradews'