merging in master for comment branch
unborking
edited bootstrap in gemfile
merging to comments branch
ui fix and add categories