Merge branch 'master' of /Users/steven/Documents/workspace/Droidcon2014/Hackathon2014 with conflicts.
Merge remote-tracking branch 'origin/master'
Fixed conflicts