CLean merge process structure
Merge branch 'master' of https://github.com/amonszpart/globOpt

Conflicts:
	globOpt/include/globfit2/optimization/impl/merging.hpp
Add partial fitting
Fix wrong If/endif
Merge branch 'master' of https://github.com/amonszpart/globOpt
Add new user custom tags
Implement merging (1 case / 3)