hpcc changes:
:
hpcc changes 2
hpc preproc makefile
merge conflicts in master resolved from hpc