do add user page1
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/modules/fresend_partners/fresend_partners.module
do add user