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
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