Bug 1058706 — Ensure the call state is updated when a timeout is sent
Bug 1058706 — Do not return terminated calls on /calls
resolving conflicts
updating Gruntfile
removing npm-shrinkwrap
Merge pull request #197 from pdehaan/grunt-take2

Adding Grunt tasks
Merge pull request #196 from mozilla-services/1058706/filter-terminated-calls

Filter terminated calls
Bug 1059731 — Add sample configuration for FxA-oauth.
Bug 1062461 — Change default server port for tests.
Set port to 0 for random choice.
Merge pull request #198 from mozilla-services/1062461-test-fails-when-server-running

Bug 1062461 — Change default server port for tests.
Bug 1064845 — Use constants.
Use a constant for timeout.
@pdehaan review.
Improvements.
Merge pull request #200 from mozilla-services/1064845-use-constants

Bug 1064845 — Use constants.
Bug 1059131 — Merge /session and /fxa-oauth/params
Make POST /fxa_oauth/params to always return a new Hawk Session and to reject existing Hawk Session.
@mnoorenberghe feedback.
Use getOauthHawkSession for all /fxa-oauth endpoints.