new branch for android development. Commented out places needed for stoarge
Fixed merge conflicts