fix specs
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/controllers/api/v1/languages_controller_spec.rb