Updated version to 1.0.0-rc.1, see #132
Merge branch 'master' into 1.0
added dependencies.json from the build, see #132
Merge branch 'master' into 1.0
updated version to 1.0.0-rc.2
updated dependencies
Merge branch 'master' into 1.0

Conflicts:
	js/version.js
	package.json
updated dependencies
Merge branch 'master' into 1.0
copied dependencies
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
updated version to 1.0.0-rc.9
updated dependencies.json
Merge branch 'master' into 1.0
updated version to 1.0.0-rc.10
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
updated version to 1.0.0-rc.11
When tracks are joined, smooth out the new track by moving the point that joined the tracks, see #177