BugFixes, merge with last version of Android Manager