Fixed prev
Contextual define propagates to glossary view controller
Merge remote-tracking branch 'origin/dev' into test