lee/subline @ aaec00a04a1c726132bcecbef0bc5675ec70d255

Lee Morgan 832711c6c5 Add help page		%!s(int64=6) %!d(string=hai) anos
..
ingredientData.js	c535fef4f2 Prevent adding of duplicate ingredients to merchant inventory	%!s(int64=6) %!d(string=hai) anos
merchantData.js	2d73676b74 Test and fix bugs on enter transactions action	%!s(int64=6) %!d(string=hai) anos
otherData.js	da1d7791a2 Finish merge changes	%!s(int64=6) %!d(string=hai) anos
renderer.js	832711c6c5 Add help page	%!s(int64=6) %!d(string=hai) anos