Pequena alteração nas gems
Merge branch 'master' of https://github.com/jmateus/adcapp

Conflicts:
	app/models/room.rb