Created class
nothing
Fixed EditOwner
Merge branch 'johannes'

Conflicts:
	java/src/client/ButtonMenu.java
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt