Updated to version 0.9 of androi gradle plugin
Merge remote-tracking branch 'origin/master'
Renamed test folder to androidTest according to android gradle plugin guidelines