Travis: use correct version of build tools
Update to gradle 0.10 plugin
Merge remote-tracking branch 'origin/master' into beta