Removed unecessary code in HappinessAlgorithm.
Added getInstance to AppController.
Made AppController conform to the singleton pattern.
Merge branch 'master' of https://github.com/Miista/scrum.git into
Story2GUI

Conflicts:
	XP Projekt/src/dk/cph/sip/eess/control/AppController.java