ScheduledActivity with time works
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/model/ScheduledActivity.java
	Program/src/main/resources/hibernate.cfg.xml

	Program/src/test/java/edu/kea/adventureXP/model/ActivityControllerTest.java