Support links json serialization with inline objects
Merge branch 'master' into metadata-stack-goodness

Conflicts:
	Tests/Functional/ControllerTest.php
Merge pull request #43 from TheFootballSocialClub/metadata-stack-goodness

Support links json serialization with inline objects