Merge branch 'master' of https://github.com/potatolondon/djangoappengine-1-4
Split the where tree parsing and entity matching into two phases
Merge branch 'new_branch_name'