Move the edit site settings button

This is pull it inline with the other call to action buttons on the
admin dashboard.

Conflicts:
	app/lang/en/site.php
Fix #151: Always update activity definition.