adds user and comment icons to task view
needs alignment
sets everything to a left alignment
formats task icons
things
adds icons
resizes stages and tasks
Merge branch 'dev-gradle' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into task_view_icons

Conflicts:
	TaskManager/src/main/java/taskManager/view/StageView.java
	TaskManager/src/main/java/taskManager/view/TaskView.java
fixes the thing that was making the test fail
Merge branch 'dev-gradle' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into task_view_icons
adds a username and a timestamp to the activities
removes edit.png because it tells me to
Merge branch 'dev-gradle' into activity_timestamp
Merge branch 'dev-gradle' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into task_view_icons
change some strings in reports
Merge remote-tracking branch 'origin/dev-gradle' into task_view_icons
add edit.png in resources folder to avoid it being null
Merge branch 'Add-EditTaskView-ScrollPane' into dev-gradle
update the javadoc
fixes javadoc
Merge branch 'task_view_icons' into dev-gradle

Conflicts:
	TaskManager/src/main/java/taskManager/controller/EditTaskController.java