Fixed script tags and committing a neat fade in effect to load the page
Merged with master
Merged with trunk