Merge branch 'metadata' of https://github.com/prose/prose into v1.0.0
Merge branch 'v1.0.0' of github.com:prose/prose into v1.0.0
Merge branch 'v1.0.0' of github.com:prose/prose into v1.0.0
Adjusting content editing width with fixed height
Merge pull request #330 from prose/fixed-interface

Adjusting content editing width with fixed height
graphics update
Fix translation links. Fix updated markDirty function.
notifications missing notification id and adjustments to application container layout
Merge.
updating custom merge driver for dist/
Update CONTRIBUTING.md
Merge branch 'v1.0.0' of github.com:prose/prose into v1.0.0
updating gitattributes
Merge branch 'v1.0.0' of github.com:prose/prose into v1.0.0
fixing gitattributes
Adding a oauth.json file to extract this from the repo and being otherwise hard coded into the interface
conflict
Better formatting on the oauth instructions
adding oauth.json to .gitignore
Re-structuring the projects page