Tried to fix server error
Merge branch 'devmax' of https://github.com/KennethAS/Fellesprosjekt.git into devmax
Tried to fix some stuff