ADDED: Google core functionality
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
Merge master into cc-mean-shift.
.