Intermediate Checkin
Merge branch 'master' of https://github.com/santoslab/aadl-translator

# By Sam Procter
# Via Sam Procter
* 'master' of https://github.com/santoslab/aadl-translator:
  Add support for diagrams and preferences for formatting
  Tweaked occurrence syntax
  Add background properties and control-action tables