updated to android-sdk 21 for andrdoid studio 1
merged fad