Fixed conflicts and new option to hide on mobile devices.

git-svn-id: https://plugins.svn.wordpress.org/wpfront-scroll-top/trunk@839142 b8457f37-d9ea-0310-8a92-e5e31aec5664