csv import base

needs to be extended to use different params
extended .gitignore to public/uploads/
added some model stubs for csv import
Merge branch 'master' into csv_import
folder for uploaded csv files
uploading and deleting csv files now works
merge conflict in application layout solved
added some styling and changed upload message
started on the import itself, not saving the actor though yet.
Merge branch 'refs/heads/master' into csv_import
Merge branch 'csv_import' of https://github.com/pse3/SGfM into csv_import
Merge branch 'refs/heads/master' into csv_import
added cdv import link in menu
disabled actor validation

can't import actors if the current validation is active
deleting csv file fixed

could not delete if the the file wasn't on the filesystem anymore. needs some better logging though
import is now working on a basic level
added dynamic file encoding
Merge branch 'refs/heads/master' into csv_import

Conflicts:
	app/models/actor.rb
	app/views/actor/_new_actor_information_types.html.erb
	app/views/layouts/application.html.erb
	config/locales/en.yml
Merge branch 'refs/heads/master' into csv_import

Conflicts:
	app/models/actor.rb
	app/views/actor/_new_actor_information_types.html.erb
	app/views/layouts/application.html.erb
	config/locales/en.yml
Merge branch 'csv_import' of github.com:pse3/SGfM into csv_import

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