Update rssi to distance calculation.  Move calculation to Beacon class.
Merge #7.  Add todo.
Use Globals log function.
Merge pull request #7 from ritnorthstar/jp-bluetooth-liveupdate

ADDED: Live updating to our bluetooth code
Merge master into cc-smoothing.
Apply smoothing.
Merge pull request #8 from ritnorthstar/cc-smoothing

Update rssi to distance calculation.  Move calculation to Beacon class.
2D trilateration with fixed points.
Fix memory leak caused by creating too many LeScanCallbacks.
Implemented nonlinear least squares estimation for multilateration.
Adds calibration and non-linear least squares estimation.
Merge master in.
Merge pull request #9 from ritnorthstar/cc-trilateration

Adds calibration and non-linear least squares estimation.
Merge branch 'master' into GoogleMapsCore

Conflicts:
	Code/Minimap/src/main/java/com/northstar/minimap/beacon/BluetoothBeacon.java
	Code/Minimap/src/main/java/com/northstar/minimap/beacon/IBeacon.java
	Code/Minimap/src/main/java/com/northstar/minimap/beacon/StickNFindBluetoothBeacon.java
	Code/Minimap/src/main/java/com/northstar/minimap/map/Position.java