UserGuidePage Demo
pull latest code and fix conflicts