Upgrade to Gradle 1.5
Merge remote-tracking branch 'upstream/master' into gradle1.5

Conflicts:
	.gitignore