Added generic_text attribute to SimpleEntity
fixed code to pass all tests
Merge branch 'Industriromantik-develop' into develop