Update js and css load
Remove files not used any more
Merge pull request #13 from vitorgarbellini/bug2

Bug2