user mgmt improvements with profile photo and new fields
More uer profile image interim commits
More support for user profile photos
Fixing the add adoption link.
Merge branch '3.x' into whaleshark.org

Conflicts:
	src/main/webapp/WEB-INF/web.xml