Merge branch '2.1.2' of github.com:CompendiumNG/CompendiumNG into 2.1.2
Merge branch '2.1.2' of github.com:CompendiumNG/CompendiumNG into 2.1.2
Merge branch '2.1.2' of github.com:CompendiumNG/CompendiumNG into 2.1.2
remove hardcoded passw
workaround for #146 (swap menu commands)
Merge pull request #148 from maiklos/2.1.2

2.1.2