Merge branch 'master+davies_liu' into cmake+davies_liu

Conflicts:
	.gitignore
	configure.ac
	mfscgi/Makefile.am
	mfschunkserver/Makefile.am
	mfsmaster/Makefile.am
	mfsmetalogger/Makefile.am