Adding more to Array Adapter
fixing merge conflicts
pulling
blah
Adding JodaDate
Merge pull request #13 from KateCatlin/TestingArrayAdapter

Adding JodaTime