一些样式的整合。新界面的样式。
Merge branch 'official' of https://github.com/txfan/smart-logistics.git
into official

Conflicts:
	android/FreightApp/src/com/freightapp/Constants.java