Minified
Tidying up js and css sources
Removed unused js
Merge remote branch 'upstream/master'