Added links to button pages
Resolving merger conflicts
Here we go again
Merge branch '912_buttons_page' into 1178_button_links
And putting things back
Resolved merge conflicts
Initiate "special" git conflict resolution technique
Merge remote-tracking branch 'upstream/master' into 1178_button_links
Finish "special" git conflict resolution technique
Fixed profile buttonset link
Merge remote-tracking branch 'upstream/master' into 1178_button_links
Merge pull request #1189 from AdmiralJota/1178_button_links

Added links to button page