Removed unused code
Fixed regression in ConverterFactory
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4