included edit for userprofile
Merge branch 'master' of https://github.com/tjm1138/Ludus

Conflicts:
	Ludus/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache