Minor change
Merge branch 'dev_lwk4' of github.com:lwinkler/markus into dev_lwk4
Merge branch 'master' into dev_lwk4
Create a AnnotationFileReader to read subtitle files
Use a AnnotationFileWriter in LogEvent
Use json serialization in LogEvent
Add a secondary config xml, fix logging and writing of events (images still missing in json)
Fix external info of events
Merge branch 'dev_lwk4'

Conflicts:
	vp-detection