Attempts to fix noclassdeffounderror
Merge
Merge branch 'dev-serverlayer' of
ssh://git@github.com/Farenhajt/Lidkoping-SH.git into dev-serverlayer

Conflicts:
	LidkopingSHTest/.classpath
Quickfix to testing serverlayer