Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle
MDL-47762 gradereport_user: Hide contribution and weights when relevant

The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
Merge branch '47077-28' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
MDL-47545 web services: Allow cross origin requests
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
MDL-47847 Web Services: Add messaging functions to the mobile service
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle