Merge pull request #23 from yor-mozilla-com/fix959400

Bug 959400 - [Notes] oAuth session forgery
Revert "Merge pull request #23 from yor-mozilla-com/fix959400"

This reverts commit 3059d4dcd90e693b00b8ccf042c84294c9dc994c, reversing
changes made to 682944a31f28255ae3eb30cb11281f48743d1f6f.
Bug 959400 - [Notes] oAuth session forgery - second fix
Bug 959400 - [Notes] oAuth session forgery - second fix
Update manifest.webapp

bug 1007963: update version number to 2.2.1
Update manifest.webapp

bug 1007963: update version to 2.2.1
Merge pull request #24 from yor-mozilla-com/bug959400

Bug 959400 - [Notes] oAuth session forgery - second fix
Merge pull request #26 from yor-mozilla-com/bug959400-phase2

Bug959400 phase2
Merge pull request #27 from dylano/patch-1

Update manifest.webapp
Merge pull request #28 from dylano/patch-2

Update manifest.webapp
Merge branch 'phase2' of https://github.com/mozilla-b2g/notes