Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java