New
Merge remote-tracking branch 'origin/tags_new' into project

Conflicts:
	.gitignore