Introduced default value 400 for fade-in speed
updated minified files and removed conflict markers from default.html