Merge origin/first into first

Conflicts:
	.gitignore
Merge origin/first into first
Merge origin/first into first