ReseveringView test
Merge branch 'master' of https://github.com/UnseenBook/ipsen2

Conflicts:
	leen/meij/utilities/Site.java
	leen/meij/views/MasterView.java