Changed choices registration API. Closes #1170
Merge branch 'development' of github.com:wlanslovenija/nodewatcher into development