Finishing some commenting and building APK
Merge remote-tracking branch 'origin/Working'