update diagnosis
Javadoc
Updated
Merge
Merge branch 'origin/master'

Conflicts:
	ch.bfh.bti7081.s2013.white/src/main/java/ch/bfh/ti/soed/white/mhc_pms/data/enums/CivilStatus.java
	ch.bfh.bti7081.s2013.white/src/main/java/ch/bfh/ti/soed/white/mhc_pms/ui/MainPanel.java
	ch.bfh.bti7081.s2013.white/src/main/java/ch/bfh/ti/soed/white/mhc_pms/ui/PmsUI.java
	ch.bfh.bti7081.s2013.white/src/main/java/ch/bfh/ti/soed/white/mhc_pms/util/Hash.java
	ch.bfh.bti7081.s2013.white/src/test/java/ch/bfh/ti/soed/white/mhc_pms/data/PmsEntityContainerTest.java