Show more
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt

Conflicts:
	java/src/client/Calendar.java