updated syncing
Merge branch 'master' of
https://github.com/wanderer/ethereum-client

Conflicts:
	package.json