Implementing demo buttons for rold, tommy and kristina
Merge remote-tracking branch 'origin/master'