Simplifying processor.cpp (untested)
Merge branch 'master' of git://github.com/nathanathan/ODKScan-core