Need to commit?
Merge branch 'master' into development

Testing how merge works
Merge branch 'development'

Testing how merge works
Commiting before trying major change in BoxContentsAdapterView to
reverse order of views
Reversed order of adding box objects so most recent shows at top
Commit before editing autocomplete funnctionality to edittext. Added
some minor functionality for parsing strudels and pushing them to sqlite
db
Res messed up. Committing before removing and restoring
Built out basic Activity for listing contacts.  Includes very basic
methods for SMS and Email
Added username to registration screen. Created DB for user data, which
only includes one table for friends for now.  UserDBHelper class
interfaces with this DB. App pulls user's friends and stores here upon
login.
Added phone number field to registration
just to commit
Merge branch 'master' into gesturedetector