Updated and integrated android
Merge branch 'master' of https://github.com/MarkFouche/cos301_2014_g1