added activities!
Merge branch 'database-persistence' of https://github.com/dcpounds/wpi-suite into activities
small changes to activities
Merge branch 'database-persistence' into activities

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/model/task/TaskModel.java
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/view/tab/NewTaskTab.java
got rid of orig files that didn't belong