PDF
Merge branch 'phase3' of https://github.com/sosaavedra/securecoding into phase3

Conflicts:
	website/sendEmail.php
Merge sql changes