syntax
Merge branch 'master' of https://github.com/DocX/h-farm-autoalert

Conflicts:
	src/com/texa/odblogbt/Connection.java