develop in it-hpc
eooo
Merge branch 'develop' of github.com:delaossa/pplasma into develop

Conflicts:
	exes/doSnapshot.cc
fix
Merge branch 'develop' of github.com:delaossa/pplasma into develop

Conflicts:
	exes/doSnapshot.cc