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