Fix merge conflicts with master in cmake_qt5

Conflicts:
	cockatrice/src/main.cpp

Ref #142

It's making travis complicated

Ref #127

Server log filtering

4 space indent + code flow rewrite for easier readability.

You won’t have to copy manually all the dlls in the release directory
anymore

removed extra un-needed empty line.

changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities

updated settings name (loglevel) to a more descriptive name (writelog)
added logfilters setting to allow user defined filters.

rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).

It's always windows.

Recompiled usermanual.