Enable proper toolbar.
Clean code.
Merge pull request #180 from capacity4dev/176

Clean code from FeatureContext.
Merge remote-tracking branch 'origin/develop' into feature/CFD-151-Discussion_message
Merge pull request #178 from capacity4dev/141

Enable admin toolbar.
Merge remote-tracking branch 'origin/develop' into feature/CFD-151-Discussion_message