NOJIRA Straighten out tests for this branch

In develop/1.5. this is all set up for Travis CI but someone might
wanna run tests in this version too
NOJIRA Fix for GitHub issue 131

PHPs json_encode encodes empty arrays as lists (‘[]’) instead of
objects (‘{}’). We now force it to treat empty array return values from
either BaseModel or SearchResult::get() as objects by inserting an
empty stdClass object in the result array that is later passed to
json_encode.
Merge branch 'master-fix' into develop

Conflicts:
	tests/lib/ca/AttributeValues/GeocodeAttributeValueTest.php
	tests/lib/ca/BundlableLabelableBaseModelWithAttributesTest.php
	tests/lib/core/ConfigurationTest.php
	tests/lib/core/Controller/ControllerTest.php
	tests/lib/core/Models/DatamodelTest.php
	tests/lib/core/Models/ModelTest.php
	tests/lib/core/Parsers/TimeExpressionParserTest.php
	tests/lib/core/SearchResult/SearchResultTest.php