Start on register overlay + pull in overlay styles + converted api.util to use bootstrap modal
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
Merge branch 'newframework' into register

Conflicts:
	shared/oae/css/oae.skin.css
Implemented register overlay
Clean up some i18n strings
Removed the old register page
Removed unused API functions
Removed unused translation strings
Fixed i18n issues
Merge branch 'newframework' into register

Conflicts:
	shared/oae/css/oae.base.css
Followed up on code review