Merge branch 'master' of https://github.com/MikkelCph/OOSE-Project-JUS-PAU-MIK

Conflicts:
	AwesomeApp1/AwesomeApp1.userprefs