Improved the preview
Removed CMakeLists.txt.user
Removed click package
Merged from master