Added Task Type
Added Task Severity
Added new task statuses: "In Progress" and "Ready for Test"
Merge branch 'master' of https://github.com/telerik/phabricator

Conflicts:
	src/applications/maniphest/controller/ManiphestTaskEditController.php