changes
Merge remote-tracking branch 'upstream/master'
small changes to dashboard
test
add comments to companies
add up / down votes to company comments
added fix for comments
test
test merge