Moved 'showbutton' option from the RST files to the config file, added additional directories to conf.py for AV and Exercises
Fixed merge conflict