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

Conflicts:
	android/WisdomCity/src/com/softstone/wisdomcity/Constants.java