get working on new machine
Merge branch 'master' of https://github.com/chrismckelt/Lacjam

Conflicts:
	common/License.xml
major NUGET upgrade