adds some stuff
fixes filepicker so it works
Merge branch 'master' of https://git.heroku.com/peaceful-eyrie-6343

Conflicts:
	app/views/application/home.html.erb