Update for SdkVersion 21
Merge branch 'nhachicha-gradle' into gradle