Merge pull request #11 from fpirola/master

Review JavaScript and static media folder