Changed onActivityResult
Merge branch 'master' of github.com:cuberob/Hackathon2014