Add 1024GB memory option
Merge remote-tracking branch 'origin/master' into c1
Merge commit '960399591af46cae778725dd0d88c2f5d67b2d8c' into merge-linux-port

Conflicts:
	src/jhProtominer/global.h