Fix problem with Cargo.toml, make compilation work
Merge branch 'master' of https://github.com/emctoo/iota into emctoo-master

Conflicts:
	Cargo.lock
Merge branch 'emctoo-master'