Layouts
Some bug
Preprocessor fix
Merge branch 'master' of https://github.com/AlexLeSang/ECOHT-ANN

Conflicts:
	mainwindow.ui

Merging
Preprocessor test
Merge branch 'master' of https://github.com/AlexLeSang/ECOHT-ANN