Starting with cleanup and updating versions

We are updating gradle versions, using the new spring building
system. (copying from facebook plugin :D)
Merge remote-tracking branch 'iamedu/master'

Conflicts:
	build.gradle