added cookie plugin, images/logos, and a shitload of TODO's
Merge remote-tracking branch 'origin/master'