Merge commit '79690458e649bb114b124ec90351a856198095cd' into nb-54

Resolves #54
Resolves #55

Conflicts:
	library/Swagger/Swagger.php
	tests/Swagger/Fixtures/Resources/Pet.php