..
Merge branch 'master' of https://github.com/semicolok/vwell

Conflicts:
	.gradle/1.5/taskArtifacts/fileHashes.bin
	.gradle/1.5/taskArtifacts/fileSnapshots.bin
	.gradle/1.5/taskArtifacts/taskArtifacts.bin