gps hits sorted, gps estination clickable
merge, linking of hammer.js
painful merge
Parental control basic layout done
Fixed conflicts related to adding phone button in snowslide.html