#addTaskWithAdditionalFields #editTaskWithAddition
Merge branch 'master' of https://github.com/damianborycki/pmsystem

Conflicts:
	module/Application/Controller/IssuesController.php
	module/Application/Model/Domain/FieldValue.php