GPII-1251: Fixed to merge cleanly and work with the review 4 branch#410

Merged

kaspermarkus merged 14 commits intoGPII:review4from

kaspermarkus:GPII-1251-review4

Oct 20, 2015

Commits on Aug 6, 2015

GPII-1251: First steps toward implementation of PCP
Kasper Markus
committed

Commits on Aug 20, 2015

GPII-1251: Added integration tests and calls from userlogin/logout
Kasper Markus
committed
GPII-1251: Removed unnused argument from userlogin.js handlers... moved config file that was previously moved by mistake
Kasper Markus
committed

Commits on Sep 11, 2015

GPII-1251: Merged with latest master and resolved conflicts
Kasper Markus
committed

Commits on Sep 14, 2015

Update PCPChannel.md
Kasper Markus
committed

Commits on Oct 15, 2015

GPII-1251: Updated the documentation on the PCP according to review comments
Kasper Markus
committed
GPII-1251: Updated with latest changes from master
Kasper Markus
committed
GPII-1251: Commiting to show stuff to antranig
Kasper Markus
committed

Commits on Oct 16, 2015

GPII-1251: Fixed up the code a bit, to remove hard dependency between login/logout actions and PCP. It now uses events instead
Kasper Markus
committed
GPII-1251: Merged conflict between local and remote copy of the branch
Kasper Markus
committed
GPII-1251: Updated documentation wording to be more clear on direction of socket communication
Kasper Markus
committed
GPII-1251: Removed stray comma
Kasper Markus
committed

Commits on Oct 19, 2015

GPII-1251: Ensured that this PR merges cleanly with the review 4 branch
Kasper Markus
committed

Commits on Oct 20, 2015

GPII-1251: Ensuring that the clients will be notified with changes
javihernandez
committed