removed masterpw.info
rest security updated
Merge branch 'master' into geofence