Merge git://github.com/derega/philo into develop. Merged derega's nav example changes...