Trying to make combined view operatable
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/content/PersonCard.java
IML apparently got changed