Merge branch 'master' of github.com:Mancy/whatsbulk-android

Conflicts:
	.gradle/1.8/taskArtifacts/fileHashes.bin
	.gradle/1.8/taskArtifacts/fileSnapshots.bin
	.gradle/1.8/taskArtifacts/taskArtifacts.bin
	whatsbulkclient/src/main/java/com/mancy/whatsbulkclient/Dashboard.java