Merge branch 'master' into develop

README.md

@@ -279,14 +279,14 @@ Then run the tests:
 
 Copyright (C) 2010-2014 Almende B.V.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Vis.js is dual licensed under both
 
-   http://www.apache.org/licenses/LICENSE-2.0
+  * The Apache 2.0 License
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+and
+
+  * The MIT License
+    http://opensource.org/licenses/MIT
+
+Vis.js may be distributed under either license.