added some more documentation
added template for pagination
merged conflicts