Merge branch 'develop'
fixed cookie module
Merge branch 'master' into develop