fix conflicts
fix conflicts

* origin/results-wiredata:
  rename "local-result" to "seat-result" throughout, and reorganise so
seat result fragment is generated on the server (not handlebars)
  reorganise tom's national-change slope templates
  add minitable to state-of-play
  state-of-play: don't show squares for 'gains'; general service
refactor
  setup db in npm run watch command

Conflicts:
	package.json
	server/service/state-of-play.js

ft-interactive/ge15,ft-interactive/ge15,ft-interactive/ge15