before merge
Merge branch 'master' of https://github.com/giyyapan/Babylon-Anna

Conflicts:
	task.coffee
	task.js
fix conflict