Fixed namespace expansion where a model shares the same name as its namespace.

Conflicts:
	src/Wave/DB/Query.php
Merge branch 'master' of git://github.com/wave-framework/wave