Nexus 4 and Nexus5 model-specific calculations passing tests
Nexus 4 and Nexus5 model-specific calculations passing tests
Merge branch 'android-model-distance-calcs' of github.com:AltBeacon/android-beacon-library into android-model-distance-calcs
update javadocs for distance calculations
Merge branch 'android-model-distance-calcs'

Conflicts:
	src/main/java/org/altbeacon/beacon/distance/AndroidModel.java
	src/main/java/org/altbeacon/beacon/distance/CurveFittedDistanceCalculator.java
	src/main/java/org/altbeacon/beacon/distance/DistanceCalculator.java
	src/main/java/org/altbeacon/beacon/distance/ModelSpecificDistanceCalculator.java
	src/test/java/org/altbeacon/beacon/distance/ModelSpecificDistanceCalculatorTest.java