Merge remote-tracking branch 'origin/master'

Conflicts:
	Moovers.Application/Moovers.Web/ResourceList.targets
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 550ebc9545fb09f7ade8cbb19cc0fc7414e597e9.
new url created

var protpcol = $location.$$protocol + '://';
var host = $location.host();
var port = ':' + $location.port();
var url = protpcol + host +port;
serviceDefer.URL = url;