(Issue2739) Don't cache friendly URLs. Also fixes oae.bootstrap.js parsing issue
Reorder expires directive for /tests/
Accidentally checked in a new nginx.conf. Reverting
Remove extraneous /docs location. Don't set all of /docs/ as uncached, just the HTML files
Remove references in nginx.conf to my local file-system
Providing a focus style for Browse buttons
Fixed typo
Hashing macros, moving macros and errors to shared since they are used by all
Merge pull request #2945 from nicolaasmatthijs/browseFocus

Providing a focus style for Browse buttons
Fix clip regression
Added Discussion as metadata to clip + Fixed display issue with non-manage clips + automatically float left for oae-threedot titles
Updated documentation
Merge branch 'issue-2739' of git://github.com/mrvisser/3akai-ux into issue-2739
Re-integrated docs and spacing fixes
de_DE translation - Second Refinement
#2870 - Timeago shouldn't take the user his timezone into account

When getting a 'x time ago' value we should not add the user's timezone offset.
We can rely on the browser's timezone for this information.
Merge pull request #2948 from nicolaasmatthijs/clipRegression

Clip regression
Moved error css and js to /shared + moved favicon.ico to /shared
Merge branch 'master' of github.com:oaeproject/3akai-ux
Merge branch 'issue-2870-timeago-timezones' of git://github.com/simong/3akai-ux into issue-2870-timeago-timezones