Merge tag '2.1.0' into develop

c1dd3c2 Merge pull request #25 from kemitix/feature/fix-mount-android-sdk-in-studio
* andrdoi-sdk: Added meld
android-sdk: add bash-completion to aid git

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
android-sdk: upgrade SDK to 23.0.2

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
android-sdk: upgrade SDK Tools to 23.0.2

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
Merge pull request #26 from kemitix/feature/upgrade-android-sdk-23.0.2

Feature: upgrade android sdk 23.0.2
android-studio: upgrade to 0.8.2

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
Merge pull request #28 from kemitix/issue-27-android-studio-0.8.2

android-studio: upgrade to 0.8.2
Merge pull request #29 from kemitix/develop

Release 2.2.0