Better search for resource_ids (includes the alignment made to the String Pool)
Merge branch 'master' of github.com:maldroid/manifesto