Merge pull request #2 from unikent/master

Merge master into STABLE
Fix various SQL injections
Merge pull request #3 from unikent/fix/sql-inject

Fix/sql inject