Extra options added for CSV imports.
Merge branch 'master' of https://github.com/Thomite/pa
Resolved some conflicts