Merge remote-tracking branch 'origin/master' into Issue_26

Conflicts:
	.gitignore
Merge branch 'Issue_26' of https://github.com/xaviermichel/simple-ged into Issue_26

Conflicts:
	.gitignore