fix inputs/dbfiles
Merge branch 'master' of github.com:PecanProject/bety

Conflicts:
	app/views/dbfiles/_index_table.html.erb
	app/views/dbfiles/new.html.erb
	app/views/dbfiles/show.html.erb
	app/views/inputs/new.html.erb
	app/views/inputs/show.html.erb