Tons of mobile styles and addition of hammerjs
fixed merge conflicts