Alert Object
Fix conflict
Merge branch 'master' of https://github.com/cuberob/Hackathon2014