Merge branch 'wdat2-develop' into stoewer
Bugfix session: removed all major bugs from the main application
Merge branch 'stoewer' into wdat2-develop