Merge branch 'master' of git://github.com/melinath/philo

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Added grappelli inlines for contentlets and attributes which become active if grappelli is installed.
  Corrected NewsletterView add_item method to join a list of author full_names instead of a QuerySet of models.
  Bugfix: corrects erratic TreeModel get_path behavior. Was returning an extra slash at the end of paths with a given root.
  Moved get_subpath and get_reverse_params prototypes into View model.