Initial merge
Update ignore files
Merge branch 'master' into development

Conflicts:
	.gitignore