Merge tag '2.0.0' into develop

3284c82 Merge pull request #24 from kemitix/feature/android-sdk-as-persistent-container
10148fb Merge pull request #23 from kemitix/feature/switch-to-oracle-java-7
0170ff3 Merge pull request #22 from kemitix/feature/use-ubuntu-as-base
9681008 Merge pull request #21 from kemitix/feature/android-studio-sh-persistent-container
2730873 Merge pull request #20 from kemitix/feature/android-studio-0.8.0
android-sdk: export volume after it has been populated

Otherwise an empty folder is exported.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
Merge pull request #25 from kemitix/feature/fix-mount-android-sdk-in-studio

android-sdk: export volume after it has been populated
android-sdk: add meld for use with git-gui

Should consider moving git to a separate image.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
android-sdk: add meld to Contains list

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
version: bump to 2.1.0

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
Merge branch 'release/2.1.0'

c1dd3c2 Merge pull request #25 from kemitix/feature/fix-mount-android-sdk-in-studio
* andrdoi-sdk: Added meld