Tweaking where plugin nav goes
Tweaking where plugin nav goes
Tweaking where plugin nav goes
Merge branch 'master' into develop
Fixing csrf issue
Reverting some ui changes
Merge branch 'develop'