Merge pull request #3 from trewto/developer

Developer
Merge pull request #4 from trewto/developer

Developer
Javscript and CSS update:
Merge pull request #5 from trewto/master

Update javascript and CSS