just
Cloud Android fixed
merging for pull
Architecture changes