Merging work on user-defined area based algorithms.

You'll need to reload the database, as I've changed several models and fields.