131118 -- <meta name="viewport" content="width=device-width, initial-scale=1 maximum-scale=1.0 user-scalable=0">
Merge remote-tracking branch 'origin/master'