Correction to merge for incompatible maps, fixes #262
Add pom.xml to documentation/examples so that it's easy to build the
zips and webpages without dealing with the ide/ stuff.
[skip ci]
Drop some stray lines from the build.properties files
[skip ci]
Merge remote-tracking branch 'origin/development' into ncb/development
Merge remote-tracking branch 'origin/kel/astv2' into ncb/development
Fix to text and location of warning 5010
Correction to cycles type check and interpretation, fixes #264
Merge remote-tracking branch 'origin/ncb/development' into ncb/development
Corrections to SL test results for warning 5010
Merge branch 'origin/test'