Merge
Android, windows phone fixes