removed hammer.js
set viewport size
merge conflict