commit changes to pageload and buttonclick
Merge branch 'microsoft-surface' of https://github.com/robpointmarc/pointmarc-public into microsoft-surface