Merge pull request #136 from maiklos/2.1.2

2.1.2
further work on the feature suggestions collection
Merge branch '2.1.2' of github.com:CompendiumNG/CompendiumNG into 2.1.2