New Version widget followup
Make the spacebar usable for inline edit
Merge branch 'createNewVersionIssues' of git://github.com/bp323/3akai-ux into createNewVersionIssues
Moved CSS style to its logical group
fix utf-8 encoding for accented chars
Merge branch 'español' of git://github.com/stuartf/3akai-ux into español
Fixing colon issues in Spanish i18n files
Upgrade to jQuery 2.0
Fix issue with inline editing triggered by hitting space
Merge branch 'inlineEditSpace' of git://github.com/bp323/3akai-ux into inlineEditSpace
Nginx: Support more mimetypes.
Nginx config: Addressed nitpick PR comment about sectioning mimetypes.
Merge pull request #2759 from simong/nginx-mime-types

Nginx: Support more mimetypes.
Merge branch 'newframework' into userProfiles

Conflicts:
	ui/js/content.js