fixes
Merge branch 'master' of https://github.com/schumi399/klaseko-api

Conflicts:
	app/controllers/api/v1/institutions_controller.rb