Moved all csrf_token tags used by templates inheriting from modify-object.html to the inheriting templates for consistency
Merge remote-tracking branch 'origin/master'