Implement ButtonsViewController sample.
fixed conflict with Segments feature in the main view controller.
commit master before merge
another commit of master - obviously I'm doing soething in the qrong sequence :-)