wip
Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

Conflicts:
	features/personas/dumps/minimal_seed.sql