JOINDIN-249 - Unit tests for Request object in API v2
Merge remote-tracking branch 'dstockto/cs_countries_model'
Merge remote-tracking branch 'dstockto/cs_categories_model'
Unit tests for the Timezone class for API v2

JOINDIN-249
Merge branch 'master' of git://github.com/joindin/joind.in
Merge remote-tracking branch 'dstockto/apiv2_request_test' into apiv2-quality
tweaks to make tests run for PHPUnit 3.6
grabbing talk type information to add to talk resource
Combine API-V2 tests with existing site tests
test from Rich
updating frisby tests for rename talk category/type field
Merge remote-tracking branch 'dstockto/apiv2_request_test'
Merge remote-tracking branch 'lornajane/apiv2-quality'
Merge remote-tracking branch 'dstockto/apiv2_timezone_test'
removing the path restriction on the phpunit target in build.xml
Merge branch 'apiv2-talktype'