Merge master to developer -JPittmanFix
Merge branch 'JPittmanFix' of https://github.com/itraycer/iTraycer into developer

Conflicts:
	index.html