moves add button to navbar
Merge branch 'release/20130323-release-7'

* release/20130323-release-7:
  moves add button to navbar