update paginator
Merge branch 'master' of github.com:mikeage/greydragon

Conflicts:
	views/paginator.html.php
update paginator
Merge branch 'master' into mikeage.net_theme