Merge pull request #6 from viebel/yehonathan

Merge branch 'master' into yehonathan
run tasks.js only on task page
merge master