Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts:
	dist/vis.js
	dist/vis.min.js

HISTORY.md

@@ -1,16 +1,18 @@
 vis.js history
 http://visjs.org
 
-## 2014-03-06, version 0.7.0
+
+## 2014-03-07, version 0.7.0
 
 ### Graph
 
 - changed navigation CSS. Icons are now always correctly positioned.
 - added stabilizationIterations option to graph.
-- added storePosition() method to save the XY positions of nodes in the dataset.
-- seperated allowedToMove into allowedToMoveX and allowedToMoveY. This is required for initializing nodes from hierarchical layouts after storePosition().
+- added storePosition() method to save the XY positions of nodes in the DataSet.
+- separated allowedToMove into allowedToMoveX and allowedToMoveY. This is required for initializing nodes from hierarchical layouts after storePosition().
 - added color options for the edges.
 
+
 ## 2014-03-06, version 0.6.1
 
 ### Graph

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "0.7.0-SNAPSHOT",
+  "version": "0.8.0-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "0.7.0-SNAPSHOT",
+  "version": "0.8.0-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {