Merged changes made to tomahawk.js in tomahawk-android