Added cookies for unique id and session.
Merge remote-tracking branch 'origin/develop' into develop