change db connectionstring and webapi config file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	ola/ola.webapi/Web.config
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 69fa2ec47192e117c9a8578a308ede750e522f4b.