junção de versões
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/iconfs.iml
	.idea/workspace.xml
	app/models/day.rb
	app/models/document.rb
	app/models/event.rb
	app/models/meeting.rb
	app/models/note.rb
	app/models/schedule.rb
	app/models/user.rb
	config/routes.rb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
resolução do bug das tabelas intermédias