add test for jade's inline tags, fix #
Merge remote-tracking branch 'origin/master'