change packages to org.atrocitywatch
passwords now awatch
Merge branch 'master' of https://github.com/TheConnMan/AWS-Hackathon-2014.git