wip - Store roles and affiliations with occupants
Dont check for var attribute on form fields of type fixed
Merge branch 'master' into muc_roles

Conflicts:
	.gitignore