adds a username and a timestamp to the activities
removes edit.png because it tells me to
Merge branch 'dev-gradle' into activity_timestamp
add edit.png in resources folder to avoid it being null
Merge branch 'dev-gradle' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into activity_timestamp

Conflicts:
	TaskManager/src/main/java/taskManager/view/EditTaskView.java