fixes to study deletion stuff (mostly paths)
Merge branch 'develop' of https://github.com/rubenarslan/formr into develop

Conflicts:
	webroot/admin/survey/delete_results.php