changes to tests
just to push
Merge branch 'master' of github.com:gizotti/yamato_api

Conflicts:
	app/controllers/api/events_controller.rb
	spec/controllers/events_controller_spec.rb