Merge branch 'release/2.6.0'
bugfix for non existing country code in invoicefee
fixed wrong version code 2.6.0 to 2.1.1
Merge branch 'hotfix/2.1.1' into develop