Try out new Query/Resolver classes
Merge remote-tracking branch 'origin/master' into queries
Merge remote-tracking branch 'origin/master' into queries
Add Resolver.Component trait.
Rename Component trait to Injected
Merge branch 'master' into queries
Merge branch 'master' into queries
Make resolver return None instea of null
Make both resolver query methods return options
Merge branch 'master' into queries
Merge branch 'master' into queries
Merge branch 'master' into queries
Update IDEA project file for IDEA 11
Merge branch 'master' into queries

Conflicts:
	baitha.iml
Set up modified name for queries branch
Mark requery as deprecated as the underlying method is deprecated
Update build to Scala 2.9.2
Update IDEA project to new Scala version
Move testutils to test directory.
Add initial ThreadUtils and ActivityThreadUtils implementation.