Merge branch 'release/0.6.1' into develop
Update link
Merge branch 'develop'
Update names
Merge branch 'develop'
Update names
Merge branch 'develop'
Update names
Merge branch 'develop'
Update BrowserSync
Update Bluebird
Update documentation
Merge branch 'release/0.10.4' into develop
Merge branch 'release/0.10.4'
Update testing modules
Merge branch 'develop'
Merge branch 'master' of https://github.com/jupl/btc into develop

Conflicts:
	CHANGELOG.md
	README.md
	app/assets/index.html
	jakelib/test.jake
	package.json
Update passport-local
Update documentation
Merge branch 'release/0.1.2' into develop