Merge Development (Release 2.1.0)

- Removed Flexform
  - No seperated detailpage anymore
- Parser improvement
- implemented multiple descriptions for term
- Code cleanup and small improvements