Fix to work with latest verison of active_model_serializers gem
Add checking for attribute aliases
Add missing name accessor on Embed
Merge remote-tracking branch 'upstream_fork/master'

Conflicts:
	active_model_serializers-matchers.gemspec