New videocapture and general changes.
Merge branch 'master' of https://github.com/jaantti/Firestarter

Merge conflict