rebase master and fix data not going to jade template