Merge branch 'airlines_annotation' into 'develop'

Airlines & domainmodel annotations

See merge request !84