* Update to neww lcov API
Merge branch 'master' of https://github.com/yoogx/ocarina
Merge branch 'master' of https://github.com/yoogx/ocarina
Merge branch 'master' of https://github.com/yoogx/ocarina
	* Correct copyright headers, minor reformatting