fixed events
Merge branch 'master' of https://github.com/TheConnMan/AWS-Hackathon-2014.git