Added e-mail field to registration form
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/includes/functions.php
	site/reg_pages/reg_add.php