modif cmake to include make test
reindent
update headers
Merge branch 'plugins' into dev