Migrated Measurement code out of Android application into project.  Updated tests to be Junit 4.