merge conflic
Merge upstream master
Use of the latest markup change for the zebra working example. Added new working example to the working example main page.