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

Conflicts:

	SystemSetup/BusinessRules/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SystemSetup/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SystemSetup/Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SystemSetup/SystemFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SystemSetup/SystemSetup.suo
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
First Sync
Merge branch 'master' of https://github.com/hendriqis/systemsetup

Conflicts:
	SystemSetup/SystemSetup.suo
Merge branch 'master' of https://github.com/hendriqis/systemsetup

Conflicts:
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache