Merge pull request #15 from decatan/master

fixed js and wp8 layout