add a macro for add discussion to library activity
Removed unused keys
support multiple discussion adds at a time
WIP for document view mode
Merge branch 'master' into etherpadding

Conflicts:
	node_modules/oae-core/etherpad/css/etherpad.css
Fixed padding and margin on view mode
Merge branch 'nginx-sync' of git://github.com/mrvisser/3akai-ux into nginx-sync
Small follow-up ordering fix
don't gradient popovers on ie9
Merge branch 'discussionActivity' of git://github.com/stuartf/3akai-ux into discussionActivity
Follow-up fixes for discussion add to library activity
Made upload new version more consistent with upload
Merge branch 'popoverflow' of git://github.com/stuartf/3akai-ux into popoverflow
Merge pull request #2967 from nicolaasmatthijs/etherpadding

Etherpad view mode visual improvements
Applying skipIE to all
Merge pull request #2968 from nicolaasmatthijs/uploadnewversion

Made upload new version more consistent with upload
Need to use @skipIE: true
Updated documentation
Merge branch 'master' of github.com:oaeproject/3akai-ux
Fixing tab keyboard trap