alerts leftovers
Merge branch 'master' of https://github.com/limorl/Hackathon2014