sanitize file name and user input
sanitize file name and user input
resolve conflicts
Merge branch 'master' of https://github.com/BibAlex/bhl_rails