new branch for android development. Commented out places needed for stoa...

...rge