fixed bug: watchdog timeout causes bad exception. linux build.
fixed bug: watchdog timeout causes bad exception. linux 32bit build.
fixed bug where CPU has less memory than GPU causing NULL malloc
fixed bug: watchdog timeout causes bad exception.

windows 32/64 bit build
Merge branch 'develop' of https://github.com/millecker/rootbeer1; branch 'master' of git://github.com/pcpratts/rootbeer1 into develop

Conflicts:
	csrc/compile_linux_x64
	csrc/compile_linux_x86
	csrc/rootbeer_cuda_x64.so.1
	csrc/rootbeer_cuda_x86.so.1
	csrc/rootbeer_opencl_x64.so.1
	csrc/rootbeer_opencl_x86.so.1
	csrc/rootbeer_x64.so.1
	csrc/rootbeer_x86.so.1