Merge branch 'navigationlib_userreports' of git://github.com/stronk7/moodle