Merge branch 'master' of git://github.com/pcpratts/rootbeer1

Conflicts:
	csrc/compile_linux_x64
	csrc/compile_linux_x86
	csrc/org/trifort/rootbeer/runtime/CUDAContext.c
	csrc/rootbeer_cuda_x64.so.1
	csrc/rootbeer_cuda_x86.so.1
	csrc/rootbeer_opencl_x64.so.1
	csrc/rootbeer_x64.so.1
	csrc/rootbeer_x86.so.1
Revert automatic merge
Revert changes before merge
Merge branch 'master' of git://github.com/pcpratts/rootbeer1
Add native Integer.toString(int) and Long.toString(long)
Update native at_illecker_double_to_string
Merge branch 'master' of git://github.com/millecker/rootbeer1 into develop