Merge branch 'Biber/feature/groups' into dev
Modify .travis.yml for heroku
Merge remote-tracking branch 'origin/dev' into Biber/feature/navigation
Modify .travis.yml for heroku
Modify .travis.yml for heroku
Add links to navigation ref #42
Merge branch 'Biber/feature/navigation' into dev
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' into Biber/feature/navigation
Merge branch 'Biber/feature/navigation' into dev
Merge branch 'dev' into Biber/feature/groups