updated UPGRADE docs to include bundle exec before stopping delayed job
changed the order slightly of the upgrade steps, to upgrade rvm after stopping services. Also cd from and backto the directory to pick up the ruby and gemset changes
fix to deleting avatar images
moved changing avatar out of edit form, and is now accessible by a like under the picture, if editing is enabled
prevent the avatar being removed when editing a project, institution, person or programme
update tags
Merge seek-0.21 mercurial into seek-0.21

Conflicts:
	.hgtags
Merge branch 'seek-0.21'

Conflicts:
	app/models/avatar.rb
small fix to grammer in text
Merge branch 'seek-0.21'