Inactive Activity + Refactoring + More
Merge branch 'master' of https://github.com/warreq/AdventureXP

Conflicts:
	Program/src/main/java/edu/kea/adventureXP/model/ActivityController.java
	Program/src/main/java/edu/kea/adventureXP/view/InstructorViewerUI.java
	Program/src/main/java/edu/kea/adventureXP/view/ManageInstructorUI.java

Program/src/test/java/edu/kea/adventureXP/model/ActivityControllerTest.j
ava
Merge branch 'master' of https://github.com/warreq/AdventureXP