add db/ActiveQuery.php
Merge branch 'develop'