enable package restore
Merge branch 'npr' into step-2

Conflicts:
	AnimalKingdom/AnimalKingdom.sln
Merge branch 'step-2' into step-3