HEY we have some javascript here!! try to close the notice and error
Merge branch 'master' into federico
hide tables if empty
Merge branch 'master' into federico

solved conflicts
Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
Merge pull request #56 from elitenomad/federico

Federico