weather service
Merge branch 'official' of https://github.com/incito/smart-logistics.git
into official

Conflicts:
	android/FreightApp/src/com/freightapp/Constants.java
	android/FreightApp/src/com/freightapp/fragments/HomePageFragment.java
	android/WisdomCity/src/com/softstone/wisdomcity/Constants.java