Update 1.0.0.5
Merge branch '1.0.0.5' of https://github.com/CryptoGir/SHACoin into 1.0.0.5

Conflicts:
	src/main.cpp