Several bug fixes
- "TLV larger than 127" bug fixed
- Android contact.conf fixed (timescale -> scale)
- DiscoveryManager changes from lasted revision undone