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
Made (New post) get populated *after* marking read
Checked monitor prefs on "next game" on Overview
Tweaked challenge text
Added sort_order for buttonset
Moved player statuses to player_status table
Removed debugging code
Added support for tags for buttons
Fixed python unit test
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
* log BMUser and BMAPI based on apache_note() parameters
Merge pull request #1214 from cgolubi1/271_apache_config

Looks reasonable to me.
Changed default values of obutton and opponent in python function wrap_create_game