Merged Android App into Master