Merge begins
Merge commit '28ddb85c8f4d22f7ac6a1c2b12b21efe8f3074fe'

Conflicts:
	CMakeModules/FindLibgit2.cmake
	doc/project/template.tex