Merge pull request #559 from Tendrid/develop

transitions
allow filters on non-Frame fields.
delete unused code/functions
make framesets a mongoengine document
Merge pull request #560 from demaagdk/develop

Non-frame filter queries
allow nested conditionals in frame filter
Merge pull request #561 from demaagdk/develop

allow nested conditionals in frame filter
fix for legacy filter format
cleanup
testing
fix
Merge pull request #562 from demaagdk/develop

Develop
alter filters