Merge branch 'develop-36-aviation-without-nmvoc' into 'master'

Solved: NMVOC or CH4 have to be in the aviation_source_pollutant_list

Closes #36

See merge request !31