Remove matchmedia feature, we are using Modernizr
Text bugfixes
Merge branch 'origin/master'