lots of stuff
new commit blabla

Conflicts:

	Program/src/main/java/edu/kea/adventureXP/presenter/ActivityViewerPresenter.java