Merge origin/master

Conflicts:
	.gitignore
Merge origin/master
Merge origin/master

Conflicts:
	.gitignore