Ajuste do merge
Merge branch 'master' of https://github.com/fabiojmendes/ccn.git

Conflicts:
	src/main/java/com/navita/ccn/csv/CSVEvent.java
Ajuste do merge