Added DAS includes/defines
Bugfix: Includes and spelling
Merge branch 'DAS' into develop