Merge pull request #554 from demaagdk/develop

move project statement to later so earlier queries can use index
Merge pull request #555 from demaagdk/develop

default filter results missing tolerance information
Merge pull request #558 from demaagdk/develop

Filters can Or and And conditionals
transitions
Merge pull request #559 from Tendrid/develop

transitions
allow filters on non-Frame fields.
delete unused code/functions
make framesets a mongoengine document