#317 Reordered CMake Options to use a better layout
Merge branch 'feature/#317faq' into develop