nightly changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	send.php
more changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	send.php