Merge test
Merge remote-tracking branch 'origin/Olli'

Conflicts:
	PatternsOfSoftwareDevelopment/src/bohnanza/BeanField.java
Merge branch 'master' of https://github.com/KevinBlom/POSD.git