some changes
Merge branch 'master' of github.com:pguerrant/kendo-jdi into backend
more ch
Merge branch 'master' of github.com:pguerrant/kendo-jdi into backend

Conflicts:
	create_task.php
Merge branch 'master' of github.com:pguerrant/kendo-jdi into backend
Merge branch 'master' of github.com:pguerrant/kendo-jdi into backend
add/update/change