Delete Author Comments from code
Delete author comment, cleanup indentation and trailing space
Merge branch 'develop' into task-feature

Prepare for pull request.

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/controller/AddTaskController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/ViewEventController.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/buttons/TaskButtonsPanel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tasks/NewTaskPanel.java
Merge branch 'develop' into workflow-feature

Prepare for pull request.

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/taskstatus/TaskStatus.java
Merge pull request #17 from R2-Team2/task-feature

Delete author comments
Merge pull request #18 from R2-Team2/workflow-feature

Delete author comments, cleanup indentation
Merge 'origin/develop' and feature-30

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/taskstatus/TaskStatus.java