merge
Merge branch 'master' of github.com:Xaar/wplearn
nav fix + cookie warnings