*refactor
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/dashboard/templates/serversSuccess.php
css, visual changes