removed remains of some merge conflict
fixed navbar dropdown for mobile

For details, see http://stackoverflow.com/questions/17435359/bootstrap-
collapsed-menu-links-not-working-on-mobile-devices