updated AS to 0.6, gradle to 11, build tools to 9.1
Fixed merge conflicts in app.iml and facebook_android_sdk_3_14_1.xml