Using picture object
Merged master.
Merge branch 'Hilary' into profilepicobject

* Hilary:
  Tenant admin login
  (ActivitiesPP) Cropping preview height, fixing comment indentation.
  (Paris2013) Add oae-threedots for the overlay link. Don't show mini-thumbnails for non-files
  (Paris2013) Switch 'medium' to 'normal' for page previews.
  (Paris2013) Adding multiple content items for content-related items
  (Paris2013) Initial work for PP images in activities.
Merged Hilary.
Aliasing jquery imgareaselect plugin. Removing console.log
Merge pull request #5 from mrvisser/profilepicobject

Aliasing jquery imgareaselect plugin. Removing console.log
contentId fixes
Added check for anon.
Merge branch 'profilepicobject' of github.com:simong/3akai-ux into profilepicobject

* 'profilepicobject' of github.com:simong/3akai-ux:
  Aliasing jquery imgareaselect plugin. Removing console.log
Merge pull request #2594 from simong/profilepicobject

Using picture object
resolve error 'displayName not defined'
Merge pull request #2619 from dustsnow/Hilary

resolve error "Rendering of template "admin_header_template" failed: TypeError: Cannot read property 'displayName' of undefined
Correct profile.displayName error
Merge pull request #2626 from dustsnow/Hilary

Correct profile.displayName undefined error
Merge branch 'Hilary' into newframework

Conflicts:
	shared/oae/api/oae.bootstrap.js
	ui/me.html