compatibility with android studio version 0.3.0
Merge branch 'android-studio'
merge the two reconnect branches