Updating and committing codebase from aeisele

Cloning personal repository from aeisele into the organizations master
branch for the Android application.