multiple fixes
Merge branch 'master' of https://github.com/stefanwouldgo/Bitcoin-Graph-Explorer

Conflicts:
	scripts/resume.sh
	src/main/scala/core/BlockReader.scala