fixes
Merge branch 'master' of https://github.com/cuberob/Hackathon2014
Merge branch 'master' of https://github.com/cuberob/Hackathon2014
Merge branch 'master' of https://github.com/cuberob/Hackathon2014
alarmmanager proximity fixes
Merge branch 'master' of https://github.com/cuberob/Hackathon2014
Merge branch 'master' of https://github.com/cuberob/Hackathon2014
merge