Merge remote-tracking branch 'origin/master' into History
resource renamed
resources reordered and documented
resource renamed
default for shuffle attibrute set to "false". Use "true" for shuffling answers
resource renamed
resource renamed
resources joint
resource renamed
resource renamed
resource renamed
resource renamed
string resources cleaned up
Merge remote-tracking branch 'origin/History'