fixing comments
removing magic number
moving tests to correct folder
organizing test resources
minifying js files
Merge remote-tracking branch 'origin/master'