Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Adder libraries tilknyttet jcalendar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Adder libraries tilknyttet jcalendar
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Lagt til en del greier på roomres. Ikke ferdig