Updates

Updates and cleanup
Updated Mambu Android implementaion

Updates and clean up for Mambu Android app