add visit
admin change
Merge remote-tracking branch 'origin/visit_stash'

Conflicts:
	protected/models/User.php
contact form and admin e-mail change