27.millores finalitzada
Merge branch '27.millores'

Conflicts:
	public/assets/js/jsonClient.js