Read equipment types from separate columns
Merge branch 'master' of github.com:finnishtransportagency/digiroad2 into improve_excel_import
Small fixes to csv parsing.
Merge branch 'master' of github.com:finnishtransportagency/digiroad2 into improve_excel_import

Conflicts:
	digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/util/BusStopExcelDataImporter.scala
Merge branch 'master' of github.com:finnishtransportagency/digiroad2 into improve_excel_import
Reverting back to using println for logging
Merge branch 'master' of github.com:finnishtransportagency/digiroad2 into improve_excel_import
Merge pull request #190 from finnishtransportagency/improve_excel_import

Improve excel import