Tracked down the image problem when a location is deleted.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	ro-frontend/public/js/controllers.js
When a comment is loaded, we also load dependent (foreign key'd) relationships, including the user.