Handle nulls
Renaming
Cleaned code
Updated to Jelly Bean MR1
Merge branch 'master' of github.com:jschmid/AndroidOnFire