merged back gh-pages
fixed retina and mobile mq