Merge request

[iafilius]

Hi,

I'm about to continue to integrate button reads (code posted on Baruch's open issues), and would like to start making button based menu's. For that it would be nice these branches (barch - swegener) get merged again. Reviewed it, and looks good.

Regards, Arjan