various update

improved m7
fixed --help in cpuminer.c (thanks to tpruvot)
added average and standard deviation (statistics error on average)
hashrate
change in the method to search for findind nonce in keccak256
correct compatibility issues
Merge branch 'master' of https://github.com/djm34/ccminer

Conflicts:
	ccminer.vcxproj
	x13/cuda_m7_sha256.cu
	x13/cuda_mul.cu
	x13/cuda_sha512.cu
	x13/cuda_whirlpool512.cu
	x13/m7.cu
	x13/m7_keccak512.cu
Why is git adding .orig files?
fix merge