test

test
EC

hope conflict is fixed
Merge remote-tracking branch 'origin/EC' into eduardo

Conflicts:
	DB.sql
	EventCreation.php
	change-pwd.php
	include/fg_membersite.php
	registration.php
	reset-pwd-req.php
	resetpwd.php
	scripts/pwdwidget.js