updated jade to 1.3 (fixing the mixing bug)
Merge pull request #624 from leider/master

updated jade to 1.3 (fixing the mixing bug)
Merge commit '00cf3afb5bfabfdb0fcfacffd328516787855da0' into nicoleactivity