full calendar
Merge branch 'master' into AndreDelgado

Conflicts:
	app/controllers/records_controller.rb
	app/views/meetings/show.html.erb
	app/views/records/show.html.erb
Merge pull request #2 from epreto/AndreDelgado

Andre delgado