* fixed option watcher
* activeGroup
Merge branch 'dev' into gh-pages