Updates to rolls, ready for template.

The AD&D2E sheet now has updated roll buttons, and buttons for each
weapon slot and proficiency slot. It's also been prepared for
availability as a standard template.
fixing merge