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

Conflicts:
	sites/all/themes/fresend/css/main.css
	sites/all/themes/fresend/templates/page--partners--addplace.tpl.php
	sites/all/themes/fresend/templates/page--partners.tpl.php