Merge remote-tracking branch 'wagn/master' into import_json

Conflicts:
	vendor/wagn
remove old non-mirated migration
fixed unfedined tag, add claim box, update new claim js and boxes for
company and topic
handling new view for contribution_count
Merge remote-tracking branch 'xithan/master'
Merge remote-tracking branch 'henry/import_json'
submod tick
updated lock file
breakage on missing test database config
fix migration
:Merge remote-tracking branch 'decko/master'

Conflicts:
	mod/wikirate/set/right/contribution_count.rb
touched up contribution count