updated Makefiles
Merge branch 'master' of https://github.com/mmonschau/101integrate