Merge WFGit

Conflicts:
	.gitignore