Squashed commit of the following:

Lots of commits related to Location bolt

commit 6d959082a6d77c9fb3ffe1afc6e9940c7cebafc3
Author: Ravi Sharma <ping2ravi@gmail.com>
Date:   Sun Aug 3 15:19:47 2014 +0100

    Will delete existisng user and device
Merge branch 'master' into ravi