Merge branch 'master' of C:\Users\Joakim\Documents\IntelliJ\devguiGroup8 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/db.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/db.xml
Merge remote-tracking branch 'origin/master'
Minor fixes