Merge pull request #2688 from bp323/newversion

Create and implement the uploadnewversion widget
Merge pull request #2691 from bp323/2634FollowUp

Follow up on #2676
Merge pull request #2696 from bp323/XSSFollowup

XSS Follow-up
Merge up to master with Hilary fixes.

Also resolved the following:

* Fixed inline CSS
* Use /api/ui/skin with a link tag instead of CSS import
* Fix path issues in requirejs / minify

Merge branch 'issue-2608' into newframework-optimize

Conflicts:
	Gruntfile.js
	node_modules/oae-core/activity/activity.html
	node_modules/oae-core/contentcomments/contentcomments.html
	shared/oae/api/oae.api.util.js
	shared/oae/api/oae.bootstrap.js
Fixed bad merge w/ Activity
Upgrading grunt-ver to contain fix to hashes.json
Merge origin/newframework and fix conflicts
Fix underscore ending up in opimtimized build
Prevent inlining of font woff files, change to a whitelist hash policy
Merge pull request #2705 from mrvisser/newframework-optimize

Merge optimized build to newframework
Etherpad integration
New Version widget followup
(Issue2716) Fix optimized build for /docs
Etherpad widget refinements
Merge branch 'newframework' into 2634FollowUp

Conflicts:
	node_modules/oae-core/activity/activity.html
	node_modules/oae-core/topnavigation/js/topnavigation.js
	ui/creategroup.html
	ui/js/index.js
Improvements to login dropdown and notifications style
Changed play button color on landing page
Make the spacebar usable for inline edit
Used tenant displayName in setPermissions as well
Upgrade Bootstrap to 2.3.1