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

Conflicts:
	features/personas/generating_personas.feature
Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

Conflicts:
	features/personas/generating_personas.feature