eitthvað bull
Merge branch 'master' of https://github.com/haffii/Ruber

Conflicts:
	out/production/Ruber/is/ru/honn/ruber/process/TripImportProcess.class