added (r) to windows
added HTML5 Shiv v3.6.2, issue WPN-XM/WPN-XM/#107
Merge branch 'master', remote-tracking branch 'origin/master'