Added user input sanitation
Merge branch 'mysql_escape' into dev