Combine Ivan Parts and Add menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	DatabaseConnector/Database.csproj