Merge branch 'development' into osc
Merge branch 'development' into osc
* fixed bug with ADM id, SYS id was used instead
Merge branch 'osc' into development
Merge branch 'development' of github.com:swissbib/sbvf2 into development