Merge branch 'employee-task-assigned'

Conflicts:
	Task Allocation/src/main/java/com/Hussain/pink/triangle/View/AllocationView.form
	Task Allocation/src/main/java/com/Hussain/pink/triangle/View/AllocationView.java