new cmake: merging cmake: added options (modules)
new cmake: merging CMakeLists.txt moved upnp etc