Second Sync
Merge branch 'master' of https://github.com/hendriqis/systemsetup

Conflicts:
	SystemSetup/SystemSetup.suo
	Web/obj/Debug/Web.vbproj.GenerateResource.Cache