sync with desktop
Merge branch 'master' of github.com:wcharczuk/hoverable