Added Jade plugin
Merge confilict resolved
Merge confilict resolved
Merge branch 'snappylabs-master'