Merge pull request #89 from soyuka/develop

Cookie display issue
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
V