(Issue 2608) Hashing image files; moving pluginBuilder out of API. Documentation touch-ups
Merge remote-tracking branch 'origin/Hilary' into issue-2608

Conflicts:
	shared/oae/api/oae.bootstrap.js
(Issue 2608) Replacing references of /shared, /ui and /admin resources in widgets as well.
Create and implement the uploadnewversion widget
Follow up on #2676
Filter slashes from search hashes.
Fixed OAE icon becoming too large in header
Fixing path issue when hashing widget files
Merge origin/newframework and fix conflicts
Fix error codes in content.js
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
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