Add jade and then-jade as project dependencies
Merge branch 'master' into dev