meh

general work…
Merge branch 'master' of https://github.com/byroncoetsee/WIL2014

Conflicts:
	Project Implementation/onClickInventory/onClickInventory/ftpHelper.cs