Feature/android

Android beta with Nick's changes merged in