trying to get this tracking right.
Merge branch 'master' of https://github.com/llsutherland/NFL

Conflicts:
	NFL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache