Proximity manager tested
Merge branch 'master' of https://github.com/darshankapashi/zeon