added javadocs and fixed bug with slug
Merge branch 'dynamic' of https://github.com/evashek/surferpedia into dynamic