* merging.
task list bug.
Merge branch 'Features/organization' of github.com:SaltySoft/SmartBlocks into Features/organization
* bug tasks subtasks.
	Merge branch 'Features/organization' of github.com:SaltySoft/SmartBlocks into Features/organization

Conflicts:
	Plugins/Organization/App/Controllers/TaskTagsController.php
	Plugins/Organization/Public/Apps/Tasks/Models/Task.js