[Aimmath-developers] merging develop 2_1 back into head

[Gustav W D. <gu...@ma...>]

Thank you all for the many improvements you have contributed to AiM.

I will now merge the develop_2_1 branch back into the head branch. From now
on all development will take place directly in the head branch.

Gustav