a
Merge branch 'master' of github.com:hendriqis/systemsetup

Conflicts:
	SystemSetup/SystemSetup.suo
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache