Merge pull request #2733 from sick-trigger/master

monkey throwing redux
added safety checks for bad values in eftpos + atms

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
resolved a MySQL statement issue

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2734 from caelaislinn/master

Small fixes