cleaned up spaces, for danny!
combine js added
Merge remote-tracking branch 'origin/master'