dru full
Merge remote-tracking branch 'origin/master'

Conflicts:
	page/user/delete.php
fix submit skip over time