Delete author comment, cleanup indentation and trailing space
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 #18 from R2-Team2/workflow-feature

Delete author comments, cleanup indentation