Add CORS/p3p to / and /end_session
Merge branch 'master' into public_demo_20130402
Issue 20: Fix cookie race condition through serialization
Merge branch 'master' into public_demo_20130402