Merge origin/master

Conflicts:
	src/factories/issueFactory.hh