save wp text finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/send_wp.js