tull
Merge branch 'master' of https://github.com/aleksanw/Systemutvikling-fellesprosjekt

Conflicts:
	src/client/gui/AddEvent.java
	src/client/gui/Buttons.java
Merge branch 'master' of https://github.com/aleksanw/Systemutvikling-fellesprosjekt