6/7/2014 (12:20 PM PST)
[HUHX0015]
* Merge attempt of packages.
Commit from huhx0015 to bugfix.
Commit from huhx0015 to bugfix.
Commit from huhx0015 to bugfix.
Merge remote-tracking branch 'origin/bugfix'

Conflicts:
	AndroidProximityReference/src/main/java/com/airportvip/app/AVIPFragment.java
	AndroidProximityReference/src/main/java/com/airportvip/app/AVIPWeather.java
	AndroidProximityReference/src/main/java/com/radiusnetworks/proximity/androidproximityreference/MainActivity.java
	AndroidProximityReference/src/main/res/values/styles.xml