first commit to antox
merged with upstream
Removed Home button from WelcomeActivity and its bug
merged latest upstream
Merge remote-tracking branch 'upstream/master' into develop
Added a layout file for the spinner items

Required in order to change the appearance of spinner items, which ATM looks squashed.
merge with upstream
Updating jToxcore to fix crash
Merge pull request #95 from dethstar/master

Send push notification on friend request
Merge pull request #94 from martinhath/master

Added layout file for spinner items
Deleted project.properties
Merge remote-tracking branch 'upstream/master' into develop
deleted eclipse prefs
Merge pull request #91 from cuttingedge03/develop

Bug fix for app crash in WelcomeActivity
Fixed a crash in SettingsActivity
Merge pull request #96 from cuttingedge03/develop

Fixed a crash in SettingsActivity
Implementing callback methods and adding a friend adds them to your friend list
Forgot callback files
adds devices to readme