small change to test separate branches
Merge remote-tracking branch 'origin/master' into sean
conflict test sean
Merge remote-tracking branch 'origin/master' into sean
Merge remote-tracking branch 'origin/master' into sean
upvoteing claims (partial) login checks
change cctop to avoid collision
Merge remote-tracking branch 'origin/master' into sean
Integrated adding new tags to claims and company

(almost done, need small factoring in front and back end)
Merge remote-tracking branch 'origin/master' into sean
merged back with master