Merge branch 'master' of https://github.com/kipusoep/UrlTracker

Conflicts:
	Properties/AssemblyInfo.cs
	UI/UrlTrackerInfo.aspx
Merge branch 'master' of https://github.com/kipusoep/UrlTracker

Conflicts:
	UI/UrlTrackerInfo.aspx