Implemented cookie-support for navigation
Merge remote-tracking branch 'origin/master'