Tests fixing.
Merge branch 'master' into test-fixes

Conflicts:
	spec/grape-active_model_serializers/formatter_spec.rb
Merge pull request #29 from ignat-zakrevsky/test-fixes

Tests fixing.