updating gitignore
cleaning up solution
Merge remote-tracking branch 'origin/development'

Conflicts:
	.gitignore
	FoundationEngine.v12.suo