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
Remove requirement for propertyDisplayValue in property update API
Use propertyValue, not propertyDisplayValue when updating properties
Merge pull request #190 from finnishtransportagency/improve_excel_import

Improve excel import
Remove debug output
Remove redundant test
Merge pull request #193 from finnishtransportagency/unify-property-value

Unify property value handling
Refactoring actionpanel not to use oskari
Refactoring styles and removing unnecessary divs in action panel
Add normalize.css to project
Refactoring actionpanel, simplify structure
Refactoring actionpanelBox
Refactored edit mode button functionality
If user has role viewer, do not show edit controls