fixed indentation
Merge branch 'master' into indentation

Conflicts:
	samples/multicam/multigrab.cpp
Merge pull request #3 from emblem/indentation

Indentation