Database installer
Merge branch 'master' of github.com:opensourceautomation/Installer

Conflicts:
	CustomActions/DatabaseInstall.Designer.cs
Database installer