Fixed merge problems
Fixed tessdemo header