Merge branch 'refs/heads/develop'

Conflicts:
	readme.md

.travis.yml

@@ -1,24 +1,23 @@
 language: node_js
+sudo: false
 
 env:
   - TEST_DIVA=source
   - TEST_DIVA=build
 
 install:
-  - npm install less
-  - wget http://dl.google.com/closure-compiler/compiler-latest.zip
-  - unzip compiler-latest.zip
-  - chmod a+rx compiler.jar
+  - npm install -g gulp
+  - npm install
   - phantomjs --version
 
-before_script: ./build.sh all
+before_script: gulp develop:build
 
-script: ./build.sh test
+script: gulp develop:test
 
 notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#ddmal"
-    on_success: change
-    on_failure: change
-    skip_join: true
+webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6885fd1dbe70aca78516
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always

AUTHORS

@@ -1,7 +1,8 @@
 Authors of diva.js
 
 Wendy Liu (wendy.liu[at]mail.mcgill.ca)
-Evan Magoni
+Evan Magoni (evan.magoni[at]mail.mcgill.ca)
+Andrew Horwitz
 Andrew Hankinson (andrew.hankinson[at]mail.mcgill.ca)
 Laurent Pugin (lxpugin[at]gmail.com)
 

LICENSE

@@ -1,6 +1,6 @@
 Diva.js
 
-Copyright (C) 2011-2014 by Wendy Liu, Evan Magoni, Andrew Hankinson, Laurent Pugin
+Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/AUTHORS

@@ -0,0 +1,19 @@
+Authors of diva.js
+
+Wendy Liu (wendy.liu[at]mail.mcgill.ca)
+Evan Magoni (evan.magoni[at]mail.mcgill.ca)
+Andrew Horwitz
+Andrew Hankinson (andrew.hankinson[at]mail.mcgill.ca)
+Laurent Pugin (lxpugin[at]gmail.com)
+
+Project Coordinator:
+Ichiro Fujinaga (ich[at]music.mcgill.ca)
+
+Development of Diva.js (past and present versions) was sponsored by the following institutions:
+
+Swiss National Science Foundation
+Social Sciences and Humanities Research Council of Canada
+Répertoire International des Sources Musicale (RISM) Switzerland
+Canadian Foundation for Innovation
+Centre for Interdisciplinary Research in Music Media and Technology (CIRMMT)
+Schulich School of Music, McGill University

build/LICENSE

@@ -0,0 +1,21 @@
+Diva.js
+
+Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.