Add rescue from stale object error in template
Add rescue from stale error in profile controller
Change success for notice
Merge ../x0y0

Conflicts:
	config/locales/views.es.yml