updated makefiles
Merge branch 'master' into hla
updated and added makefiles