Resolve conflicts for 3.0.0 release

Author: JRegimbal

README.md

@@ -1,6 +1,6 @@
 Neon3
 =====
-[![Build_Status](https://travis-ci.org/DDMAL/Neon2.svg?branch=develop)](https://travis-ci.org/DDMAL/Neon2)
+[![Build_Status](https://travis-ci.org/DDMAL/Neon2.svg?branch=master)](https://travis-ci.org/DDMAL/Neon2)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard)
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Neon2",
-    "version": "3.0.0-b3",
+    "version": "3.0.0",
     "description": "A web-based editor for correcting MEI-Neume files",
     "main": "server.js",
     "license": "MIT",
@@ -49,7 +49,8 @@
         "express": "^4.16.3",
         "multer": "^1.3.0",
         "nodemon": "^1.17.5",
-        "pug": "^2.0.3"
+        "pug": "^2.0.3",
+        "verovio-dev": "file:src/verovio-dev"
     },
     "devDependencies": {
         "babel-preset-env": "^1.7.0",