NOJIRA - Update the styleguide
Merge pull request #2097 from christianv/nojira-update-styleguide

NOJIRA - Update the styleguide