Change 3 5.17.10.0
Merge branch '5.17.0.0' of https://github.com/NerfGun/Miniture into 5.17.10.0

Conflicts:
	NerfGuns/NerfGuns/About.aspx