Initial commit
Merge remote-tracking branch 'development/development' into development

Conflicts:
	.gitignore