proposing some structures
gitignore
Merge remote-tracking branch 'origin/hot-fixes' into development

Conflicts:
	bin/.gitignore