Corrected username and password
Externalising username and password (since source code is public!)
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle