Merge remote-tracking branch 'ding2tal/development' into ding2tal
Merge branch 'ding2tal' into develop
Removed make-file.
Merge branch 'develop'
Release: v1.12
Merge remote-tracking branch 'artesis/master' into development
Re-added makefile after merge