Modal reorg
Removed first timer template
Fixed primary nav menu issue

The menu was too nested and Bootstrap was hiding it for logged out users
Merge branch 'master' into production

* master:
  Fixed primary nav menu issue
  Removed first timer template
  Modal reorg