Master UI Adjustment
Merge remote-tracking branch 'origin/master'

Conflicts:
	generationflux/bin/generationflux.dll
	generationflux/bin/generationflux.pdb
	generationflux/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	generationflux/obj/Debug/generationflux.dll
	generationflux/obj/Debug/generationflux.pdb
Merge branch 'master' of https://github.com/nathanielasare/generationflux

Conflicts:
	generationflux/bin/generationflux.dll
	generationflux/bin/generationflux.pdb
	generationflux/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	generationflux/obj/Debug/generationflux.dll
	generationflux/obj/Debug/generationflux.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	generationflux/bin/generationflux.dll
	generationflux/bin/generationflux.pdb
	generationflux/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	generationflux/obj/Debug/generationflux.dll
	generationflux/obj/Debug/generationflux.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	generationflux/bin/generationflux.dll
	generationflux/bin/generationflux.pdb
	generationflux/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	generationflux/obj/Debug/generationflux.dll
	generationflux/obj/Debug/generationflux.pdb