android-apt available
Merge dev