Don't sort parties twice
Merge branch 'staging'

Conflicts:
	app/assets/view/homeView.html