Moved public/javascripts -> public/js and updated references in grunt.js, .gitignore and routes.js. Moved testing scripts fromproject root to scripts/
Merge remote-tracking branch 'origin/master'