Merge remote-tracking branch 'origin/master'

KvizServer/app/build.gradle

KvizServer/app/src/main/AndroidManifest.xml

...rver/app/src/main/java/onlab/kvizserver/GameActivity.java

...p/src/main/java/onlab/kvizserver/GameControlFragment.java

...ver/app/src/main/java/onlab/kvizserver/LobbyActivity.java

...rver/app/src/main/java/onlab/kvizserver/MainActivity.java

KvizServer/app/src/main/java/onlab/kvizserver/Operation.java

...p/src/main/java/onlab/kvizserver/QuestionListAdapter.java

.../src/main/java/onlab/kvizserver/QuestionListFragment.java

...onlab/kvizserver/QuestionListGeneratorDialogFragment.java

...er/app/src/main/java/onlab/kvizserver/model/Question.java

...Server/app/src/main/res/layout/fragment_question_list.xml

...in/res/layout/fragment_question_list_generator_dialog.xml