fix edit server redirect
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/dashboard/actions/actions.class.php
fix edit server redirect